diff --git a/.github/workflows/build-prerelease.yml b/.github/workflows/build-prerelease.yml
deleted file mode 100644
index 8ba760d5..00000000
--- a/.github/workflows/build-prerelease.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: skaffold-build-prerelease
-on:
-  push:
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+"
-jobs:
-  pipeline:
-    name: Skaffold Docker build
-    runs-on: ubuntu-20.04
-    steps:
-    - name: Checkout Repo
-      id: checkout
-      uses: actions/checkout@v3
-    - name: Harbor Login
-      id: harbor_login
-      uses: docker/login-action@v2
-      with:
-        registry: harbor.cyverse.org
-        username: ${{ secrets.HARBOR_USERNAME }}
-        password: ${{ secrets.HARBOR_PASSWORD }}
-    - name: Install Kubernetes Tools
-      id: install_k8s_tools
-      uses: yokawasa/action-setup-kube-tools@v0.9.2
-    - name: Build Docker images
-      id: build
-      run: |
-        skaffold build --file-output build.json
-    - name: Build manifest tarball
-      id: build_manifest_tarball
-      run: |
-        tar -czpvf deploy-info.tar.gz build.json skaffold.yaml k8s
-    - uses: ncipollo/release-action@v1
-      with:
-        artifacts: "build.json,deploy-info.tar.gz"
-        prerelease: true
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
deleted file mode 100644
index be07f902..00000000
--- a/.github/workflows/build-release.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: skaffold-build-release
-on:
-  push:
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
-jobs:
-  pipeline:
-    name: Skaffold Docker build
-    runs-on: ubuntu-20.04
-    steps:
-    - name: Checkout Repo
-      id: checkout
-      uses: actions/checkout@v3
-    - name: Harbor Login
-      id: harbor_login
-      uses: docker/login-action@v2
-      with:
-        registry: harbor.cyverse.org
-        username: ${{ secrets.HARBOR_USERNAME }}
-        password: ${{ secrets.HARBOR_PASSWORD }}
-    - name: Install Kubernetes Tools
-      id: install_k8s_tools
-      uses: yokawasa/action-setup-kube-tools@v0.9.2
-    - name: Build Docker images
-      id: build
-      run: |
-        skaffold build --file-output build.json
-    - name: Build manifest tarball
-      id: build_manifest_tarball
-      run: |
-        tar -czpvf deploy-info.tar.gz build.json skaffold.yaml k8s
-    - uses: ncipollo/release-action@v1
-      with:
-        artifacts: "build.json,deploy-info.tar.gz"
diff --git a/.github/workflows/skaffold-build.yml b/.github/workflows/skaffold-build.yml
new file mode 100644
index 00000000..13312114
--- /dev/null
+++ b/.github/workflows/skaffold-build.yml
@@ -0,0 +1,16 @@
+name: skaffold-build
+
+on:
+  push:
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"
+      - "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+"
+
+jobs:
+  call-workflow-passing-data:
+    uses: cyverse-de/github-workflows/.github/workflows/skaffold-build.yml@v0.0.4
+    with:
+      build-prerelease: ${{ contains(github.ref_name, '-rc') }}
+    secrets:
+      harbor-username: ${{ secrets.HARBOR_USERNAME }}
+      harbor-password: ${{ secrets.HARBOR_PASSWORD }}
diff --git a/k8s/apps.yml b/k8s/apps.yml
index b4c3c916..9ebdfcb7 100644
--- a/k8s/apps.yml
+++ b/k8s/apps.yml
@@ -53,9 +53,11 @@ spec:
           requests:
             cpu: "100m"
             memory: "1Gi"
+            ephemeral-storage: "1Gi"
           limits:
             cpu: "3000m"
             memory: "3Gi"
+            ephemeral-storage: "1Gi"
         args:
           - --config
           - /etc/iplant/de/apps.properties
diff --git a/project.clj b/project.clj
index 64b3d5a8..6974cf5d 100644
--- a/project.clj
+++ b/project.clj
@@ -51,7 +51,8 @@
             [test2junit "1.4.4"]
             [jonase/eastwood "1.3.0"]]
   :profiles {:dev {:plugins        [[lein-ring "0.12.5"]]
-                   :resource-paths ["conf/test"]}
+                   :resource-paths ["conf/test"]
+                   :jvm-opts       ["-Dotel.javaagent.enabled=false"]}
              :repl {:source-paths ["repl"]}
              :uberjar {:aot :all}}
   :repl-options {:timeout 120000}