diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml
index 8f03b1f..20d40c1 100644
--- a/.gitea/workflows/release.yaml
+++ b/.gitea/workflows/release.yaml
@@ -77,7 +77,7 @@ jobs:
           echo "No changes to release, failing..."
           exit 1
       - name: Un-snapshot catalog versions
-        if: ${{ inputs.TYPE == 'catalog' }}
+        if: ${{ inputs.RELEASE_TYPE == 'catalog' }}
         run: |
           if [ -f versions-catalog.toml ]; then
             sed -i -E 's/^(lulz[A-Za-z]+[[:space:]]*=[[:space:]]*")([0-9]+\.[0-9]+\.[0-9]+)-SNAPSHOT(")/\1\2\3/' versions-catalog.toml
@@ -143,3 +143,30 @@ jobs:
     secrets:
       CI_BOT_USERNAME: ${{ secrets.CI_BOT_USERNAME }}
       CI_BOT_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
+
+  finalise-publish-plugin:
+    needs: release
+    if: inputs.RELEASE_TYPE == 'plugin'
+    uses: aura-ascend/common-workflows/.gitea/workflows/publish-artifact.yaml@master
+    with:
+      JAVA_VERSION: ${{ inputs.JAVA_VERSION }}
+      BRANCH_REFERENCE: "v${{ needs.release.outputs.release-version }}"
+      GRADLE_TASK: publishAllPublicationsToGiteaPackagesRepository
+    secrets:
+      CI_BOT_USERNAME: ${{ secrets.CI_BOT_USERNAME }}
+      CI_BOT_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
+
+  finalise-publish-container:
+    needs: release
+    #    if: needs.release.outputs.has-changes == 'true'
+    #    if: needs.release.outputs.has-changes == 'true' && inputs.RELEASE_TYPE == 'service'
+    uses: aura-ascend/common-workflows/.gitea/workflows/publish-container.yaml@master
+    with:
+      JAVA_VERSION: ${{ inputs.JAVA_VERSION }}
+      #      PROJECT_VERSION: ${{ needs.release.outputs.release-version }}
+      PROJECT_VERSION: "v${{ needs.release.outputs.release-version }}"
+      PROJECT_NAME: ${{ needs.release.outputs.project-name }}
+    secrets:
+      CI_BOT_USERNAME: ${{ secrets.CI_BOT_USERNAME }}
+      CI_BOT_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
+