diff --git a/.github/workflows/publish_ghcr_image.yaml b/.github/workflows/publish_ghcr_image.yaml
index 6240a8c82..7bfb17a51 100644
--- a/.github/workflows/publish_ghcr_image.yaml
+++ b/.github/workflows/publish_ghcr_image.yaml
@@ -6,8 +6,9 @@ env:
   IMAGE_NAME_UI: ${{ github.repository }}-ui
 
 on:
-  pull_request:
   push:
+    branches:
+    - master
     tags:
       - '*'
 
diff --git a/Makefile b/Makefile
index 3e2b90154..4f0e207d7 100644
--- a/Makefile
+++ b/Makefile
@@ -35,9 +35,9 @@ ifeq ($(FRESH),1)
   DEBUG_FRESH=$(shell date +"%H-%M-%S")
 endif
 
-#ifdef CDP_PULL_REQUEST_NUMBER
-#	CDP_TAG := -${CDP_BUILD_VERSION}
-#endif
+ifdef CDP_PULL_REQUEST_NUMBER
+	CDP_TAG := -${CDP_BUILD_VERSION}
+endif
 
 ifndef GOPATH
 	GOPATH := $(HOME)/go