diff --git a/openshift/ci-operator/generate-ci-config.sh b/openshift/ci-operator/generate-ci-config.sh
index 24c62af04195..f003ecd56085 100755
--- a/openshift/ci-operator/generate-ci-config.sh
+++ b/openshift/ci-operator/generate-ci-config.sh
@@ -149,8 +149,6 @@ EOF
   cron="$(generate_cron_expression)"
 
   print_single_test    "e2e-aws-ocp-${openshift//./}"             "make test-e2e"         "" "true" "generic-claim" ""
-  print_single_test    "conformance-aws-ocp-${openshift//./}"     "make test-conformance" "" "true" "generic-claim" ""
-  print_single_test    "reconciler-aws-ocp-${openshift//./}"      "make test-reconciler"  "" "true" "generic-claim" ""
 
   if [[ "$generate_continuous" == true ]]; then
     print_single_test "e2e-aws-ocp-${openshift//./}-continuous"  "make test-e2e"          "" "true" "generic-claim" "${cron}"
diff --git a/openshift/release/create-release-branch.sh b/openshift/release/create-release-branch.sh
index 9e76b5797181..24b0f6874353 100755
--- a/openshift/release/create-release-branch.sh
+++ b/openshift/release/create-release-branch.sh
@@ -30,5 +30,6 @@ if [ -d "openshift/patches-${release}" ]; then
 fi
 git apply $PATCH_DIR/*
 make RELEASE=$release generate-release
+make RELEASE=ci generate-release
 git add .
 git commit -am ":fire: Apply carried patches."