diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 55e8435d5..31ab0ede9 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -5,6 +5,10 @@ release:
     owner: kyma-project
     name: api-gateway
   prerelease: auto
+  header: |
+    Images published in {{ .Tag }} release:
+    - eu.gcr.io/kyma-project/api-gateway-controller:{{ .Tag }}
+    - eu.gcr.io/kyma-project/api-gateway-webhook-certificates:{{ .Tag }}
 builds:
 - env:
   - CGO_ENABLED=0
diff --git a/Makefile b/Makefile
index 71bf3e8c4..bfdbf94ad 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,7 @@ vet: ## Run go vet against code.
 	go vet ./...
 
 .PHONY: test
-test: manifests generate fmt vet envtest ## Run tests.
+test: manifests generate fmt vet envtest ## Generate manifests and run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out
 
 .PHONY: test-for-release
@@ -265,7 +265,9 @@ ci-pr: build test
 ci-main: build docker-build docker-push docker-build-certificates docker-push-certificates
 
 .PHONY: ci-release
-ci-release: build docker-build docker-push docker-build-certificates docker-push-certificates archive release
+ci-release: TAG=${shell git describe --abbrev=0 --tags}
+ci-release: CERTIFICATES_TAG=$(TAG)
+ci-release: build docker-build-release docker-push docker-build-certificates docker-push-certificates archive release
 
 .PHONY: clean
 clean: