diff --git a/.drone.yml b/.drone.yml
index f9da1f2a..1c01a110 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -26,18 +26,38 @@ steps:
   - name: Build Intermediate Linux Release Artifact (Binary)
     commands:
       - ./ci.sh --build-linux
+    environment:
+      STANDALONE_KEYSTORE_PASS:
+        from_secret: STANDALONE_KEYSTORE_PASS
+      FDROID_KEYSTORE_PASS:
+        from_secret: FDROID_KEYSTORE_PASS
 
   - name: Build Intermediate Android Release Artifact (.APK)
     commands:
       - ./ci.sh --build-apk
+    environment:
+      STANDALONE_KEYSTORE_PASS:
+        from_secret: STANDALONE_KEYSTORE_PASS
+      FDROID_KEYSTORE_PASS:
+        from_secret: FDROID_KEYSTORE_PASS
 
   - name: Sign Android Release Artifact (.APK) for Standalone Use
     commands:
       - ./ci.sh --sign-apk-standalone
+    environment:
+      STANDALONE_KEYSTORE_PASS:
+        from_secret: STANDALONE_KEYSTORE_PASS
+      FDROID_KEYSTORE_PASS:
+        from_secret: FDROID_KEYSTORE_PASS
 
   - name: Sign Android Release Artifact (.APK) for F-Droid Repository
     commands:
       - ./ci.sh --sign-apk-fdroid
+    environment:
+      STANDALONE_KEYSTORE_PASS:
+        from_secret: STANDALONE_KEYSTORE_PASS
+      FDROID_KEYSTORE_PASS:
+        from_secret: FDROID_KEYSTORE_PASS
 
   - name: Package Linux AppImage Artifact
     commands:
diff --git a/ci.sh b/ci.sh
index 44fbf28c..20e24372 100755
--- a/ci.sh
+++ b/ci.sh
@@ -10,11 +10,11 @@ usage () {
 }
 
 podman_offline () {
-  podman run --rm -v `pwd`:/var/lib/builder/src:U -v "$HOME/fdroid:/var/lib/builder/repo:U" -v "$HOME/fdroid-keystore:/var/lib/builder/repo/fdroid-keystore:U" -v "$HOME/standalone-keystore:/var/lib/builder/repo/standalone-keystore:U" --env FDROID_KEYSTORE_PASS="$FDROID_KEYSTORE_PASS" --env STANDALONE_KEYSTORE_PASS="$STANDALONE_KEYSTORE_PASS" --network=none --workdir "$1" "$CONTAINER_IMAGE" "$2"
+  podman run --rm -v "`pwd`:/var/lib/builder/src:U" -v "$HOME/fdroid:/var/lib/builder/repo:U" -v "$HOME/fdroid-keystore:/var/lib/builder/repo/fdroid-keystore:U" -v "$HOME/standalone-keystore:/var/lib/builder/repo/standalone-keystore:U" --env FDROID_KEYSTORE_PASS="$FDROID_KEYSTORE_PASS" --env STANDALONE_KEYSTORE_PASS="$STANDALONE_KEYSTORE_PASS" --network=none --workdir "$1" "$CONTAINER_IMAGE" "$2"
 }
 
 podman_online () {
-  podman run --rm -v `pwd`:/var/lib/builder/src:U --privileged --workdir "$1" "$CONTAINER_IMAGE" "$2"
+  podman run --rm -v "`pwd`:/var/lib/builder/src:U" --privileged --workdir "$1" "$CONTAINER_IMAGE" "$2"
 }
 
 build_linux () {