diff --git a/.github/workflows/del-env.yml b/.github/workflows/del-env.yml
index 4edf31e9847..2d4eeb3305d 100644
--- a/.github/workflows/del-env.yml
+++ b/.github/workflows/del-env.yml
@@ -1,8 +1,8 @@
 # Generated by: tyk-ci/wf-gen
-# Generated on: Wed  7 Apr 12:03:12 UTC 2021
+# Generated on: Thu  8 Apr 04:23:27 UTC 2021
 
 # Generation commands:
-# ./pr.zsh -title Remove unnecessary tagging -repos tyk -branch releng/latest -base releng/latest -p
+# ./pr.zsh -title Plugin compiler to build from tag -repos tyk -branch releng/docker -base releng/docker -p
 # m4 -E -DxREPO=tyk
 
 name: Retiring dev env
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e61bebe4e82..651be0f52df 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,8 +1,8 @@
 # Generated by: tyk-ci/wf-gen
-# Generated on: Wed  7 Apr 12:03:12 UTC 2021
+# Generated on: Thu  8 Apr 04:23:27 UTC 2021
 
 # Generation commands:
-# ./pr.zsh -title Remove unnecessary tagging -repos tyk -branch releng/latest -base releng/latest -p
+# ./pr.zsh -title Plugin compiler to build from tag -repos tyk -branch releng/docker -base releng/docker -p
 # m4 -E -DxREPO=tyk
 
 # Distribution channels covered by this workflow
@@ -191,9 +191,7 @@ jobs:
           docker push tykio/tyk-gateway:${tag}
           docker tag tykio/tyk-gateway:${tag} docker.cloudsmith.io/tyk/tyk-gateway/tyk-gateway:${tag}
           docker push docker.cloudsmith.io/tyk/tyk-gateway/tyk-gateway:${tag}
-          docker tag tykio/tyk-plugin-compiler tykio/tyk-plugin-compiler:${tag}
           docker push tykio/tyk-plugin-compiler:${tag}
-          docker tag tykio/tyk-hybrid-docker tykio/tyk-hybrid-docker:${tag}
           docker push tykio/tyk-hybrid-docker:${tag}
 
 
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 35c373c0246..ebca0d52efa 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,8 +1,8 @@
 # Generated by: tyk-ci/wf-gen
-# Generated on: Wed  7 Apr 12:03:12 UTC 2021
+# Generated on: Thu  8 Apr 04:23:27 UTC 2021
 
 # Generation commands:
-# ./pr.zsh -title Remove unnecessary tagging -repos tyk -branch releng/latest -base releng/latest -p
+# ./pr.zsh -title Plugin compiler to build from tag -repos tyk -branch releng/docker -base releng/docker -p
 # m4 -E -DxREPO=tyk
 
 
@@ -138,7 +138,7 @@ dockers:
     - "tykio/tyk-plugin-compiler:{{ .Tag }}"
     - "tykio/tyk-plugin-compiler:v{{ .Major }}.{{ .Minor }}"
   build_flag_templates:
-    - "--build-arg=TYK_GW_TAG={{ .Branch }}"
+    - "--build-arg=TYK_GW_TAG={{ .Tag }}"
     - "--label=org.opencontainers.image.created={{.Date}}"
     - "--label=org.opencontainers.image.title={{.ProjectName}}-plugin-compiler"
     - "--label=org.opencontainers.image.revision={{.FullCommit}}"
diff --git a/Dockerfile.slim b/Dockerfile.slim
index 9a922ce507f..0dbb65aa354 100644
--- a/Dockerfile.slim
+++ b/Dockerfile.slim
@@ -1,8 +1,8 @@
 # Generated by: tyk-ci/wf-gen
-# Generated on: Wed  7 Apr 12:03:12 UTC 2021
+# Generated on: Thu  8 Apr 04:23:27 UTC 2021
 
 # Generation commands:
-# ./pr.zsh -title Remove unnecessary tagging -repos tyk -branch releng/latest -base releng/latest -p
+# ./pr.zsh -title Plugin compiler to build from tag -repos tyk -branch releng/docker -base releng/docker -p
 # m4 -E -DxREPO=tyk
 
 FROM gcr.io/distroless/static-debian10
diff --git a/Dockerfile.std b/Dockerfile.std
index 8164ef56730..75e34579080 100644
--- a/Dockerfile.std
+++ b/Dockerfile.std
@@ -1,8 +1,8 @@
 # Generated by: tyk-ci/wf-gen
-# Generated on: Wed  7 Apr 12:03:12 UTC 2021
+# Generated on: Thu  8 Apr 04:23:27 UTC 2021
 
 # Generation commands:
-# ./pr.zsh -title Remove unnecessary tagging -repos tyk -branch releng/latest -base releng/latest -p
+# ./pr.zsh -title Plugin compiler to build from tag -repos tyk -branch releng/docker -base releng/docker -p
 # m4 -E -DxREPO=tyk
 
 FROM debian:buster-slim
diff --git a/aws/byol.pkr.hcl b/aws/byol.pkr.hcl
index 6a806dbf08b..4096e3a910c 100644
--- a/aws/byol.pkr.hcl
+++ b/aws/byol.pkr.hcl
@@ -1,8 +1,8 @@
 # Generated by: tyk-ci/wf-gen
-# Generated on: Wed  7 Apr 12:03:12 UTC 2021
+# Generated on: Thu  8 Apr 04:23:27 UTC 2021
 
 # Generation commands:
-# ./pr.zsh -title Remove unnecessary tagging -repos tyk -branch releng/latest -base releng/latest -p
+# ./pr.zsh -title Plugin compiler to build from tag -repos tyk -branch releng/docker -base releng/docker -p
 # m4 -E -DxREPO=tyk
 
 variable "aws_access_key" {
diff --git a/integration/terraform/outputs.tf b/integration/terraform/outputs.tf
index ec2aac089d0..36104cf41a0 100644
--- a/integration/terraform/outputs.tf
+++ b/integration/terraform/outputs.tf
@@ -1,8 +1,8 @@
 # Generated by: tyk-ci/wf-gen
-# Generated on: Wed  7 Apr 12:03:12 UTC 2021
+# Generated on: Thu  8 Apr 04:23:27 UTC 2021
 
 # Generation commands:
-# ./pr.zsh -title Remove unnecessary tagging -repos tyk -branch releng/latest -base releng/latest -p
+# ./pr.zsh -title Plugin compiler to build from tag -repos tyk -branch releng/docker -base releng/docker -p
 # m4 -E -DxREPO=tyk