diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
index 298eeb3..75426c1 100644
--- a/.github/workflows/ansible-test.yml
+++ b/.github/workflows/ansible-test.yml
@@ -109,3 +109,33 @@ jobs:
   #     - uses: codecov/codecov-action@v1
   #       with:
   #         fail_ci_if_error: false
+  #
+  downstream-sanity-29:
+    name: Sanity (Ⓐ${{ matrix.ansible }}+py${{ matrix.python }})
+    strategy:
+      matrix:
+        ansible:
+          - stable-2.9
+        python:
+          - 3.6
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+        with:
+          path: ansible_collections/community/okd
+
+      - name: Set up Python ${{ matrix.ansible }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python }}
+
+      - name: Install ansible 2.9
+        run: pip install "ansible>=2.9.0,<2.10.0"
+
+      # run ansible-test sanity inside of Docker.
+      # The docker container has all the pinned dependencies that are required.
+      # Explicity specify the version of Python we want to test
+      - name: Run sanity tests
+        run: make downstream-test-sanity
+        working-directory: ./ansible_collections/community/okd
diff --git a/Makefile b/Makefile
index 7c11c2f..a9b22e4 100644
--- a/Makefile
+++ b/Makefile
@@ -26,5 +26,20 @@ test-sanity: install
 test-integration: install
 	molecule test
 
-test-integration-incluster:
-	./ci/incluster_integration.sh
+test-integration-incluster: test-integration-incluster-upstream test-integration-incluster-downstream
+
+test-integration-incluster-upstream:
+	./ci/incluster_integration_upstream.sh
+
+test-integration-incluster-downstream:
+	./ci/incluster_integration_downstream.sh
+
+downstream-test-sanity:
+	./ci/downstream.sh -s
+
+downstream-test-integration:
+	./ci/downstream.sh -i
+
+downstream-build:
+	./ci/downstream.sh -b
+
diff --git a/ci/downstream.sh b/ci/downstream.sh
new file mode 100755
index 0000000..322a47e
--- /dev/null
+++ b/ci/downstream.sh
@@ -0,0 +1,240 @@
+#!/bin/bash -eu
+
+# Script to dual-home the upstream and downstream Collection in a single repo
+#
+#   This script will build or test a downstream collection, removing any
+#   upstream components that will not ship in the downstream release
+#
+#   NOTES:
+#       - All functions are prefixed with f_ so it's obvious where they come
+#         from when in use throughout the script
+
+DOWNSTREAM_VERSION="0.1.0"
+KEEP_DOWNSTREAM_TMPDIR="${KEEP_DOWNSTREAM_TMPDIR:-''}"
+_build_dir=""
+
+f_log_info()
+{
+    printf "%s:LOG:INFO: %s\n" "${0}" "${1}"
+}
+
+f_show_help()
+{
+    printf "Usage: downstream.sh [OPTION]\n"
+    printf "\t-s\t\tCreate a temporary downstream release and perform sanity tests.\n"
+    printf "\t-i\t\tCreate a temporary downstream release and perform integration tests.\n"
+    printf "\t-m\t\tCreate a temporary downstream release and perform molecule tests.\n"
+    printf "\t-b\t\tCreate a downstream release and stage for release.\n"
+    printf "\t-r\t\tCreate a downstream release and publish release.\n"
+}
+
+f_text_sub()
+{
+    # Switch FQCN and dependent components
+    sed -i "s/community-okd/redhat-openshift/" "${_build_dir}/Makefile"
+    sed -i "s/community\/okd/redhat\/openshift/" "${_build_dir}/Makefile"
+    sed -i "s/^VERSION\:/VERSION: ${DOWNSTREAM_VERSION}/" "${_build_dir}/Makefile"
+    sed -i "s/name\:.*$/name: openshift/" "${_build_dir}/galaxy.yml"
+    sed -i "s/namespace\:.*$/namespace: redhat/" "${_build_dir}/galaxy.yml"
+    sed -i "s/Kubernetes/OpenShift/g" "${_build_dir}/galaxy.yml"
+    sed -i "s/^version\:.*$/version: ${DOWNSTREAM_VERSION}/" "${_build_dir}/galaxy.yml"
+    find ${_build_dir} -type f -exec sed -i "s/community\.kubernetes/kubernetes\.core/g" {} \;
+    find ${_build_dir} -type f -exec sed -i "s/community\.okd/redhat\.openshift/g" {} \;
+}
+
+f_prep()
+{
+    f_log_info "${FUNCNAME[0]}"
+    # Array of excluded files from downstream build (relative path)
+    _file_exclude=(
+    )
+
+    # Files to copy downstream (relative repo root dir path)
+    _file_manifest=(
+        CHANGELOG.rst
+        galaxy.yml
+        LICENSE
+        README.md
+        Makefile
+        setup.cfg
+        .yamllint
+    )
+
+    # Directories to recursively copy downstream (relative repo root dir path)
+    _dir_manifest=(
+        changelogs
+        ci
+        meta
+        molecule
+        plugins
+        tests
+    )
+
+
+    # Temp build dir 
+    _tmp_dir=$(mktemp -d)
+    _build_dir="${_tmp_dir}/ansible_collections/redhat/openshift"
+    mkdir -p "${_build_dir}"
+}
+
+
+f_cleanup()
+{
+    f_log_info "${FUNCNAME[0]}"
+    if [[ -n "${_build_dir}" ]]; then
+        if [[ -n ${KEEP_DOWNSTREAM_TMPDIR} ]]; then
+            if [[ -d ${_build_dir} ]]; then
+                rm -fr "${_build_dir}"
+            fi
+        fi
+    else
+        exit 0
+    fi
+}
+
+# Exit and handle cleanup processes if needed
+f_exit()
+{
+    f_cleanup
+    exit "$0"
+}
+
+f_create_collection_dir_structure()
+{
+    f_log_info "${FUNCNAME[0]}"
+    # Create the Collection
+    for f_name in "${_file_manifest[@]}";
+    do
+        cp "./${f_name}" "${_build_dir}/${f_name}"
+    done
+    for d_name in "${_dir_manifest[@]}";
+    do
+        cp -r "./${d_name}" "${_build_dir}/${d_name}"
+    done
+    for exclude_file in "${_file_exclude[@]}";
+    do
+        if [[ -f "${_build_dir}/${exclude_file}" ]]; then
+            rm -f "${_build_dir}/${exclude_file}"
+        fi
+    done
+}
+
+f_install_kubernetes_core_from_src()
+{
+    local community_k8s_tmpdir="${_tmp_dir}/community.kubernetes"
+    local install_collections_dir="${_tmp_dir}/ansible_collections"
+    mkdir -p "${community_k8s_tmpdir}"
+    pushd "${_tmp_dir}"
+    #    curl -L \
+    #        https://github.com/ansible-collections/community.kubernetes/archive/main.tar.gz \
+    #        | tar -xz -C "${community_k8s_tmpdir}" --strip-components 1
+    #    pushd "${community_k8s_tmpdir}"
+    #        make downstream-build
+    #        ansible-galaxy collection install -p "${install_collections_dir}" "${community_k8s_tmpdir}"/kubernetes-core-*.tar.gz
+    #    popd
+    #popd
+        git clone https://github.com/maxamillion/community.kubernetes "${community_k8s_tmpdir}"
+        pushd "${community_k8s_tmpdir}"
+            git checkout downstream/fix_collection_name
+            make downstream-build
+            ansible-galaxy collection install -p "${install_collections_dir}" "${community_k8s_tmpdir}"/kubernetes-core-*.tar.gz
+        popd
+    popd
+}
+
+
+f_copy_collection_to_working_dir()
+{
+    f_log_info "${FUNCNAME[0]}"
+    # Copy the Collection build result into original working dir
+    cp "${_build_dir}"/*.tar.gz ./
+}
+
+f_common_steps()
+{
+    f_log_info "${FUNCNAME[0]}"
+    f_prep
+    f_create_collection_dir_structure
+    f_text_sub
+}
+
+# Run the test sanity scanerio
+f_test_sanity_option()
+{
+    f_log_info "${FUNCNAME[0]}"
+    f_common_steps
+    f_install_kubernetes_core_from_src
+    pushd "${_build_dir}" || return
+        ansible-galaxy collection build
+        f_log_info "SANITY TEST PWD: ${PWD}"
+        ## Can't do this because the upstream community.kubernetes dependency logic
+        ## is bound as a Makefile dep to the test-sanity target
+        #SANITY_TEST_ARGS="--docker --color --python 3.6" make test-sanity
+        ansible-test sanity --docker -v --exclude ci/ --color --python 3.6
+    popd || return
+    f_cleanup
+}
+
+# Run the test integration
+f_test_integration_option()
+{
+    f_log_info "${FUNCNAME[0]}"
+    f_common_steps
+    f_install_kubernetes_core_from_src
+    pushd "${_build_dir}" || return
+        f_log_info "INTEGRATION TEST WD: ${PWD}"
+        make test-integration-incluster
+    popd || return
+    f_cleanup
+}
+
+# Run the build scanerio
+f_build_option()
+{
+    f_log_info "${FUNCNAME[0]}"
+    f_common_steps
+    pushd "${_build_dir}" || return 
+        f_log_info "BUILD WD: ${PWD}"
+        # FIXME 
+        #   This doesn't work because we end up either recursively curl'ing 
+        #   community.kubernetes and redoing the text replacement over and over
+        #         
+        # make build 
+        ansible-galaxy collection build
+
+    popd || return 
+    f_copy_collection_to_working_dir
+    f_cleanup
+}
+
+# If no options are passed, display usage and exit
+if [[ "${#}" -eq "0" ]]; then
+    f_show_help
+    f_exit 0
+fi
+
+# Handle options
+while getopts ":sirb" option
+do
+  case $option in
+    s) 
+        f_test_sanity_option
+        ;;
+    i) 
+        f_test_integration_option
+        ;;
+    r) 
+        f_release_option
+        ;;
+    b) 
+        f_build_option
+        ;;
+    *) 
+        printf "ERROR: Unimplemented option chosen.\n"
+        f_show_help
+        f_exit 1
+        ;;   # Default.
+  esac
+done
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/ci/incluster_integration_downstream.sh b/ci/incluster_integration_downstream.sh
new file mode 100755
index 0000000..920c7ea
--- /dev/null
+++ b/ci/incluster_integration_downstream.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+set -x
+
+# IMAGE_FORMAT is in the form $registry/$org/$image:$$component, ie
+# quay.io/openshift/release:$component
+# To test with your own image, build and push the test image
+# (using the Dockerfile in ci/Dockerfile)
+# and set the IMAGE_FORMAT environment variable so that it properly
+# resolves to your image. For example, quay.io/mynamespace/$component
+# would resolve to quay.io/mynamespace/molecule-test-runner
+component='molecule-test-runner'
+eval IMAGE=$IMAGE_FORMAT
+
+PULL_POLICY=${PULL_POLICY:-IfNotPresent}
+
+echo "Deleting test job if it exists"
+oc delete job molecule-integration-test --wait --ignore-not-found
+
+echo "Creating molecule test job"
+cat << EOF | oc create -f -
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: molecule-integration-test
+spec:
+  template:
+    spec:
+      containers:
+        - name: test-runner
+          image: ${IMAGE}
+          imagePullPolicy: ${PULL_POLICY}
+          command:
+            - make
+            - downstream-test-integration
+      restartPolicy: Never
+  backoffLimit: 2
+  completions: 1
+  parallelism: 1
+EOF
+
+function wait_for_success {
+  oc wait --for=condition=complete job/molecule-integration-test --timeout 5m
+  echo "Molecule integration tests ran successfully"
+  exit 0
+}
+
+function wait_for_failure {
+  oc wait --for=condition=failed job/molecule-integration-test --timeout 5m
+  oc logs job/molecule-integration-test
+  echo "Molecule integration tests failed, see logs for more information..."
+  exit 1
+}
+
+# Ensure the child processes are killed
+trap 'kill -SIGTERM 0' SIGINT EXIT
+
+echo "Waiting for test job to complete"
+wait_for_success &
+wait_for_failure
diff --git a/ci/incluster_integration.sh b/ci/incluster_integration_upstream.sh
similarity index 100%
rename from ci/incluster_integration.sh
rename to ci/incluster_integration_upstream.sh