diff --git a/pipelines/git-pipeline.yaml b/pipelines/git-pipeline.yaml
index 4377fd5..4d16444 100644
--- a/pipelines/git-pipeline.yaml
+++ b/pipelines/git-pipeline.yaml
@@ -39,7 +39,7 @@ spec:
     - name: commit
       value: $(params.commit)
     taskRef:
-      name: j7s-git-clone
+      name: j7s-gerrit-clone
   - name: cat-readme
     runAfter: ["fetch-repo"]
     workspaces:
@@ -55,11 +55,8 @@ spec:
           cat $(workspaces.source.path)/README
 
   finally:
-    - name: notify-gerrit-success
+    - name: notify-gerrit
       when:
-        - input: $(tasks.status)
-          operator: notin
-          values: ["Failed"]
         - input: $(params.use-gerrit)
           operator: in
           values: ["true"]
@@ -68,26 +65,14 @@ spec:
           value: $(params.commit)
         - name: build-id
           value: $(context.pipelineRun.name)
+        - name: status
+          value: $(tasks.status)
+        - name: feedback_url
+          value: $(params.feedback_url)
+        - name: feedback_port
+          value: $(params.feedback_port)
       workspaces:
         - name: ssh-directory
           workspace: git-credentials
       taskRef:
-        name: j7s-gerrit-success
-    - name: notify-gerrit-failed
-      when:
-        - input: $(tasks.status)
-          operator: in
-          values: ["Failed"]
-        - input: $(params.use-gerrit)
-          operator: in
-          values: ["true"]
-      params:
-        - name: commit
-          value: $(params.commit)
-        - name: build-id
-          value: $(context.pipelineRun.name)
-      workspaces:
-        - name: ssh-directory
-          workspace: git-credentials
-      taskRef:
-        name: j7s-gerrit-fail
\ No newline at end of file
+        name: j7s-gerrit-notify
\ No newline at end of file
diff --git a/tasks/j7s-git-clone.yaml b/tasks/j7s-gerrit-clone.yaml
similarity index 90%
rename from tasks/j7s-git-clone.yaml
rename to tasks/j7s-gerrit-clone.yaml
index b57605a..c6a8264 100644
--- a/tasks/j7s-git-clone.yaml
+++ b/tasks/j7s-gerrit-clone.yaml
@@ -1,7 +1,7 @@
 apiVersion: tekton.dev/v1beta1
 kind: Task
 metadata:
-  name: j7s-git-clone
+  name: j7s-gerrit-clone
 spec:
   workspaces:
   - name: output
diff --git a/tasks/j7s-gerrit-fail.yaml b/tasks/j7s-gerrit-fail.yaml
deleted file mode 100644
index c7c4e6c..0000000
--- a/tasks/j7s-gerrit-fail.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: Task
-metadata:
-  name: j7s-gerrit-fail
-spec:
-  workspaces:
-  - name: ssh-directory
-  params:
-  - name: commit
-  - name: build-id
-  steps:
-  - image: 192.168.1.128:8443/gitssh:latest
-    script: |
-      #!/usr/bin/env bash
-      set -ex
-      cp -r $(workspaces.ssh-directory.path) ~/.ssh
-      chmod 700 ~/.ssh
-      chmod -R 400 ~/.ssh/*
-      ssh -p 29418 tekton@gerrit.internal.jpace121.net gerrit review \
-          -m '"Build failed. ID: $(params.build-id)"' \
-          --verified -1 \
-          $(params.commit)
\ No newline at end of file
diff --git a/tasks/j7s-gerrit-notify.yaml b/tasks/j7s-gerrit-notify.yaml
new file mode 100644
index 0000000..a9cf508
--- /dev/null
+++ b/tasks/j7s-gerrit-notify.yaml
@@ -0,0 +1,36 @@
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: j7s-gerrit-notify
+spec:
+  workspaces:
+  - name: ssh-directory
+  params:
+  - name: commit
+  - name: build-id
+  - name: status
+  - name: feedback_url
+  - name: feedback_port
+  steps:
+  - image: 192.168.1.128:8443/gitssh:latest
+    script: |
+      #!/usr/bin/env bash
+      set -ex
+      cp -r $(workspaces.ssh-directory.path) ~/.ssh
+      chmod 700 ~/.ssh
+      chmod -R 400 ~/.ssh/*
+
+      case "$(params.status)" in
+         "Succeeded" | "Completed")
+            ssh -p $(params.feedback_port) $(params.feedback_url) gerrit review \
+                -m '"Build succeeded. ID: $(params.build-id)"' \
+                --verified +1 \
+                $(params.commit)
+           ;;
+         "Failed" | "None")
+            ssh -p $(params.feedback_port) $(params.feedback_url) gerrit review \
+                -m '"Build failed. ID: $(params.build-id)"' \
+                --verified -1 \
+                $(params.commit)
+           ;;
+      esac
\ No newline at end of file
diff --git a/tasks/j7s-gerrit-success.yaml b/tasks/j7s-gerrit-success.yaml
deleted file mode 100644
index 79681cd..0000000
--- a/tasks/j7s-gerrit-success.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: Task
-metadata:
-  name: j7s-gerrit-success
-spec:
-  workspaces:
-  - name: ssh-directory
-  params:
-  - name: commit
-  - name: build-id
-  steps:
-  - image: 192.168.1.128:8443/gitssh:latest
-    script: |
-      #!/usr/bin/env bash
-      set -ex
-      cp -r $(workspaces.ssh-directory.path) ~/.ssh
-      chmod 700 ~/.ssh
-      chmod -R 400 ~/.ssh/*
-      ssh -p 29418 tekton@gerrit.internal.jpace121.net gerrit review \
-          -m '"Build success. ID: $(params.build-id)"' \
-          --verified +1 \
-          $(params.commit)
\ No newline at end of file