diff --git a/.woodpecker.yml b/.woodpecker.yml
index 49a4b3d..f07431a 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -33,14 +33,14 @@ pipeline:
     commands:
       - echo $REGISTRY_PASSWORD | docker login $REGISTRY -u $REGISTRY_USER --password-stdin
       - docker build
-        -t $REGISTRY/${CI_REPO}:${CI_COMMIT_TAG}
-        -t $REGISTRY/${CI_REPO}:$(date +%F_%H-%M)
-        -t $REGISTRY/${CI_REPO}:latest
+        -t $REGISTRY/$${CI_REPO}:$${CI_COMMIT_TAG}
+        -t $REGISTRY/$${CI_REPO}:$(date +%F_%H-%M)
+        -t $REGISTRY/$${CI_REPO}:latest
         --pull
         --build-arg $${SHOUTRRR_VERSION}
         -f $${DOCKERFILE}
         $${CONTEXT}
-      - docker push -a $REGISTRY/${CI_REPO}
+      - docker push -a $REGISTRY/$${CI_REPO}
 
   notify-matrix-success:
     image: code.balsillie.net/containers/woodpecker-util
@@ -56,7 +56,7 @@ pipeline:
     commands:
       - shoutrrr send 
         --url matrix://$${MATRIX_ACCESS_TOKEN}@$${MATRIX_HOST}:$${MATRIX_PORT}/?rooms=$${MATRIX_ROOM}
-        --message "New image build of ${CI_REPO}, ${CI_COMMIT_TAG}, has been completed and pushed."
+        --message "New image build of $${CI_REPO}, $${CI_COMMIT_TAG}, has been completed and pushed."
 
   notify-matrix-failure:
     image: code.balsillie.net/containers/woodpecker-util
@@ -72,4 +72,4 @@ pipeline:
     commands:
       - shoutrrr send 
         --url matrix://$${MATRIX_ACCESS_TOKEN}@$${MATRIX_HOST}:$${MATRIX_PORT}/?rooms=$${MATRIX_ROOM}
-        --message "New image build of ${CI_REPO}, ${CI_COMMIT_TAG}, has failed."
\ No newline at end of file
+        --message "New image build of $${CI_REPO}, $${CI_COMMIT_TAG}, has failed."
\ No newline at end of file