diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index b0f91bd..57566b6 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -23,7 +23,7 @@ jobs:
         run: |
           echo "version=$(./gradlew properties --no-daemon --console=plain -q | grep '^version:' | awk '{printf $2}')" >> $GITHUB_OUTPUT
       - name: Build artifacts
-        run: ./gradlew assemble
+        run: ./gradlew assemble shadowJar
         env:
           GH_USERNAME: ${{ github.actor }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index bceb93b..e595269 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
       - name: Build artifacts
-        run: ./gradlew assemble
+        run: ./gradlew assemble shadowJar
         env:
           GH_USERNAME: ${{ github.actor }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6f1f05a..ec590b2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
         run: |
           echo "version=$(./gradlew properties --no-daemon --console=plain -q | grep '^version:' | awk '{printf $2}')" >> $GITHUB_OUTPUT
       - name: Build artifacts
-        run: ./gradlew assemble
+        run: ./gradlew assemble shadowJar
         env:
           GH_USERNAME: ${{ github.actor }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/packages/api-token-connection-admin/src/main/kotlin/ApiTokenConnectionAdminPkg.kt b/packages/api-token-connection-admin/src/main/kotlin/ApiTokenConnectionAdminPkg.kt
index e235bc8..63fa8cb 100644
--- a/packages/api-token-connection-admin/src/main/kotlin/ApiTokenConnectionAdminPkg.kt
+++ b/packages/api-token-connection-admin/src/main/kotlin/ApiTokenConnectionAdminPkg.kt
@@ -39,7 +39,8 @@ object ApiTokenConnectionAdminPkg : CustomPackage(
             ),
         ),
     ),
-    containerImage = "ghcr.io/atlanhq/atlan-kotlin-samples:0.4.0",
+    containerImage = "ghcr.io/atlanhq/atlan-kotlin-samples:0.5.0-SNAPSHOT",
+    containerImagePullPolicy = "Always",
     containerCommand = listOf("/dumb-init", "--", "java", "ApiTokenConnectionAdminKt"),
     outputs = WorkflowOutputs(mapOf("debug-logs" to "/tmp/debug.log")),
     keywords = listOf("kotlin", "utility"),
diff --git a/packages/duplicate-detector/src/main/kotlin/DuplicateDetectorPkg.kt b/packages/duplicate-detector/src/main/kotlin/DuplicateDetectorPkg.kt
index ce7e942..e55a2eb 100644
--- a/packages/duplicate-detector/src/main/kotlin/DuplicateDetectorPkg.kt
+++ b/packages/duplicate-detector/src/main/kotlin/DuplicateDetectorPkg.kt
@@ -71,7 +71,8 @@ object DuplicateDetectorPkg : CustomPackage(
             ),
         ),
     ),
-    containerImage = "ghcr.io/atlanhq/atlan-kotlin-samples:0.4.0",
+    containerImage = "ghcr.io/atlanhq/atlan-kotlin-samples:0.5.0-SNAPSHOT",
+    containerImagePullPolicy = "Always",
     containerCommand = listOf("/dumb-init", "--", "java", "DuplicateDetectorKt"),
     outputs = WorkflowOutputs(mapOf("debug-logs" to "/tmp/debug.log")),
     keywords = listOf("kotlin", "utility"),
diff --git a/packages/migration-assistant-export/src/main/kotlin/MigrationAssistantExportPkg.kt b/packages/migration-assistant-export/src/main/kotlin/MigrationAssistantExportPkg.kt
index 77f133b..b24ee0d 100644
--- a/packages/migration-assistant-export/src/main/kotlin/MigrationAssistantExportPkg.kt
+++ b/packages/migration-assistant-export/src/main/kotlin/MigrationAssistantExportPkg.kt
@@ -68,7 +68,8 @@ object MigrationAssistantExportPkg : CustomPackage(
             ),
         ),
     ),
-    containerImage = "ghcr.io/atlanhq/atlan-kotlin-samples@sha256:09bddb2f520bb15f6b4182fc822163e51c5d9793f3f233b77585d021f321bf2f",
+    containerImage = "ghcr.io/atlanhq/atlan-kotlin-samples:0.5.0-SNAPSHOT",
+    containerImagePullPolicy = "Always",
     containerCommand = listOf("/dumb-init", "--", "java", "ExporterKt"),
     outputs = WorkflowOutputs(
         mapOf(
diff --git a/packages/migration-assistant-import/src/main/kotlin/MigrationAssistantImportPkg.kt b/packages/migration-assistant-import/src/main/kotlin/MigrationAssistantImportPkg.kt
index 47afbdb..1da7fde 100644
--- a/packages/migration-assistant-import/src/main/kotlin/MigrationAssistantImportPkg.kt
+++ b/packages/migration-assistant-import/src/main/kotlin/MigrationAssistantImportPkg.kt
@@ -87,7 +87,8 @@ object MigrationAssistantImportPkg : CustomPackage(
             ),
         ),
     ),
-    containerImage = "ghcr.io/atlanhq/atlan-kotlin-samples@sha256:09bddb2f520bb15f6b4182fc822163e51c5d9793f3f233b77585d021f321bf2f",
+    containerImage = "ghcr.io/atlanhq/atlan-kotlin-samples:0.5.0-SNAPSHOT",
+    containerImagePullPolicy = "Always",
     containerCommand = listOf("/dumb-init", "--", "java", "ImporterKt"),
     outputs = WorkflowOutputs(mapOf("debug-logs" to "/tmp/debug.log")),
     keywords = listOf("kotlin", "utility"),
diff --git a/packages/openapi-spec-loader/src/main/kotlin/OpenAPISpecLoaderPkg.kt b/packages/openapi-spec-loader/src/main/kotlin/OpenAPISpecLoaderPkg.kt
index 46c42f8..94f963f 100644
--- a/packages/openapi-spec-loader/src/main/kotlin/OpenAPISpecLoaderPkg.kt
+++ b/packages/openapi-spec-loader/src/main/kotlin/OpenAPISpecLoaderPkg.kt
@@ -73,7 +73,8 @@ object OpenAPISpecLoaderPkg : CustomPackage(
             ),
         ),
     ),
-    containerImage = "ghcr.io/atlanhq/atlan-kotlin-samples:0.4.0",
+    containerImage = "ghcr.io/atlanhq/atlan-kotlin-samples:0.5.0-SNAPSHOT",
+    containerImagePullPolicy = "Always",
     containerCommand = listOf("/dumb-init", "--", "java", "OpenAPISpecLoaderKt"),
     outputs = WorkflowOutputs(mapOf("debug-logs" to "/tmp/debug.log")),
     keywords = listOf("kotlin", "crawler", "openapi"),