diff --git a/Makefile b/Makefile
index eb874f95f5..a4c63e11ee 100644
--- a/Makefile
+++ b/Makefile
@@ -358,7 +358,7 @@ mta-release: mta-build
 	@echo " - building mtar release '${VERSION}' to dir: '${DEST}' "
 
 .PHONY: acceptance-release
-acceptance-release: clean-acceptance go-mod-tidy go-mod-vendor build-test-app
+acceptance-release: generate-fakes  generate-openapi-generated-clients-and-servers clean-acceptance go-mod-tidy go-mod-vendor build-test-app
 	@echo " - building acceptance test release '${VERSION}' to dir: '${DEST}' "
 	@mkdir -p ${DEST}
 	${AUTOSCALER_DIR}/scripts/compile-acceptance-tests.sh
diff --git a/src/acceptance/assets/app/go_app/deploy.sh b/src/acceptance/assets/app/go_app/deploy.sh
index f41235ec60..75607ad8c4 100755
--- a/src/acceptance/assets/app/go_app/deploy.sh
+++ b/src/acceptance/assets/app/go_app/deploy.sh
@@ -41,14 +41,11 @@ function deploy(){
   fi
 
   # `create-org/space` is idempotent and will simply keep the potentially already existing org/space as is
-  cf create-org "${org}" || true
-  cf target -o "${org}" || true
-  cf create-space "${space}" || true
+  cf create-org "${org}"
+  cf target -o "${org}"
+  cf create-space "${space}"
   cf target -s "${space}"
 
-  echo "current org ${org}"
-  echo "current space ${space}"
-
   local app_name app_domain service_name memory_mb service_broker service_plan
   app_name="test_app"
   app_domain="$(getConfItem apps_domain)"