diff --git a/Makefile b/Makefile
index e1e3c03553f..a13ce5419de 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,6 @@ generate-dockerfiles:
 # Generate an aggregated knative release yaml file, as well as a CI file with replaced image references
 generate-release:
 	./openshift/release/generate-release.sh $(RELEASE)
-	./openshift/release/generate-release.sh $(RELEASE) ci
 .PHONY: generate-release
 
 # Update CI configuration in the $(OPENSHIFT) directory.
diff --git a/openshift/release/create-release-branch.sh b/openshift/release/create-release-branch.sh
index 61c7bc7860d..d0bfe00a866 100755
--- a/openshift/release/create-release-branch.sh
+++ b/openshift/release/create-release-branch.sh
@@ -16,5 +16,6 @@ git fetch openshift master
 git checkout openshift/master -- openshift OWNERS_ALIASES OWNERS Makefile
 make generate-dockerfiles
 make RELEASE=$release generate-release
+make RELEASE=ci generate-release
 git add openshift OWNERS_ALIASES OWNERS Makefile
 git commit -m "Add openshift specific files."
diff --git a/openshift/release/generate-release.sh b/openshift/release/generate-release.sh
index d88e52ae56c..a26656817ca 100755
--- a/openshift/release/generate-release.sh
+++ b/openshift/release/generate-release.sh
@@ -3,15 +3,14 @@
 source $(dirname $0)/resolve.sh
 
 release=$1
-suffix=$2
 
-if [ $suffix = "ci" ]; then
-    output_file="openshift/release/knative-eventing-${suffix}.yaml"
-    image_prefix="registry.svc.ci.openshift.org/openshift/knative-${release}:knative-eventing-"
+if [ "$release" == "ci" ]; then
+    output_file="openshift/release/knative-eventing-ci.yaml"
+    image_prefix="registry.svc.ci.openshift.org/openshift/knative-nightly:knative-eventing-"
     tag=""
 else
     suffix=${release}
-    output_file="openshift/release/knative-eventing-${suffix}.yaml"
+    output_file="openshift/release/knative-eventing-${release}.yaml"
     image_prefix="quay.io/openshift-knative/knative-eventing-"
     tag=$release
 fi
@@ -25,13 +24,13 @@ cat crd-channel-resolved.yaml >> $output_file
 rm crd-channel-resolved.yaml
 
 # the Channel Broker:
-output_file="openshift/release/knative-eventing-channelbroker-${suffix}.yaml"
+output_file="openshift/release/knative-eventing-channelbroker-${release}.yaml"
 resolve_resources config/brokers/channel-broker/ channelbroker-resolved.yaml $image_prefix $tag
 cat channelbroker-resolved.yaml >> $output_file
 rm channelbroker-resolved.yaml
 
 # the MT Broker:
-output_file="openshift/release/knative-eventing-mtbroker-${suffix}.yaml"
+output_file="openshift/release/knative-eventing-mtbroker-${release}.yaml"
 resolve_resources config/brokers/mt-channel-broker/ mtbroker-resolved.yaml $image_prefix $tag
 cat mtbroker-resolved.yaml >> $output_file
 rm mtbroker-resolved.yaml