diff --git a/Makefile b/Makefile
index 4d96a19312..9491624777 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,8 @@ EXECUTABLES = curl docker gzip go
 #  docker image publishing options
 DOCKER_PUSH?=false
 IMAGE_NAMESPACE?=quay.io/argoproj
-VERSION?=v1.5.5-cap-CR-8526
-BASE_VERSION:=v1.5.5-cap-CR-8526
+VERSION?=v1.5.5-cap-CR-8526-fix
+BASE_VERSION:=v1.5.5-cap-CR-8526-fix
 
 override LDFLAGS += \
   -X ${PACKAGE}.version=${VERSION} \
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
index 852222ae32..736e2f4810 100644
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
@@ -2,7 +2,7 @@
   "swagger": "2.0",
   "info": {
     "title": "Argo Events",
-    "version": "v1.5.5-cap-CR-8526"
+    "version": "v1.5.5-cap-CR-8526-fix"
   },
   "paths": {},
   "definitions": {
diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
index 3d07c19105..8923515297 100644
--- a/manifests/base/kustomization.yaml
+++ b/manifests/base/kustomization.yaml
@@ -15,7 +15,7 @@ resources:
 images:
   - name: quay.io/argoproj/argo-events
     newName: quay.io/codefresh/argo-events
-    newTag: v1.5.5-cap-CR-8526
+    newTag: v1.5.5-cap-CR-8526-fix
 
 patchesStrategicMerge:
   - |-
@@ -30,7 +30,7 @@ patchesStrategicMerge:
             - name: eventsource-controller
               env:
                 - name: EVENTSOURCE_IMAGE
-                  value: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526
+                  value: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526-fix
   - |-
     apiVersion: apps/v1
     kind: Deployment
@@ -43,4 +43,4 @@ patchesStrategicMerge:
             - name: sensor-controller
               env:
                 - name: SENSOR_IMAGE
-                  value: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526
+                  value: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526-fix
diff --git a/manifests/extensions/validating-webhook/kustomization.yaml b/manifests/extensions/validating-webhook/kustomization.yaml
index 2cffbdd324..658123c90b 100644
--- a/manifests/extensions/validating-webhook/kustomization.yaml
+++ b/manifests/extensions/validating-webhook/kustomization.yaml
@@ -12,4 +12,4 @@ namespace: argo-events
 images:
   - name: quay.io/argoproj/argo-events
     newName: quay.io/codefresh/argo-events
-    newTag: v1.5.5-cap-CR-8526
+    newTag: v1.5.5-cap-CR-8526-fix
diff --git a/manifests/install-validating-webhook.yaml b/manifests/install-validating-webhook.yaml
index df8c288c9f..021a319882 100644
--- a/manifests/install-validating-webhook.yaml
+++ b/manifests/install-validating-webhook.yaml
@@ -107,7 +107,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526
+        image: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526-fix
         imagePullPolicy: Always
         name: webhook
       serviceAccountName: argo-events-webhook-sa
diff --git a/manifests/install.yaml b/manifests/install.yaml
index 25e16700c9..31f148602f 100644
--- a/manifests/install.yaml
+++ b/manifests/install.yaml
@@ -303,7 +303,7 @@ spec:
           value: nats-streaming:0.22.1
         - name: NATS_METRICS_EXPORTER_IMAGE
           value: natsio/prometheus-nats-exporter:0.8.0
-        image: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526
+        image: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526-fix
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -343,12 +343,12 @@ spec:
         - eventsource-controller
         env:
         - name: EVENTSOURCE_IMAGE
-          value: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526
+          value: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526-fix
         - name: NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526
+        image: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526-fix
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -388,12 +388,12 @@ spec:
         - sensor-controller
         env:
         - name: SENSOR_IMAGE
-          value: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526
+          value: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526-fix
         - name: NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526
+        image: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526-fix
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
index a8ec2ae804..84cd218730 100644
--- a/manifests/namespace-install.yaml
+++ b/manifests/namespace-install.yaml
@@ -224,7 +224,7 @@ spec:
           value: nats-streaming:0.22.1
         - name: NATS_METRICS_EXPORTER_IMAGE
           value: natsio/prometheus-nats-exporter:0.8.0
-        image: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526
+        image: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526-fix
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -265,12 +265,12 @@ spec:
         - --namespaced
         env:
         - name: EVENTSOURCE_IMAGE
-          value: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526
+          value: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526-fix
         - name: NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526
+        image: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526-fix
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -311,12 +311,12 @@ spec:
         - --namespaced
         env:
         - name: SENSOR_IMAGE
-          value: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526
+          value: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526-fix
         - name: NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526
+        image: quay.io/codefresh/argo-events:v1.5.5-cap-CR-8526-fix
         livenessProbe:
           httpGet:
             path: /healthz