diff --git a/.drone.yml b/.drone.yml
index 4065635e9..a0a38ba5b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -277,14 +277,14 @@ steps:
     - export GIT_VERSION="$VERSION.r$(git log --pretty=oneline HEAD...v$VERSION | wc -l).$HEAD"
     - export TAG_URL="https://git.platypush.tech/platypush/platypush/archive/v$VERSION.tar.gz"
     - export TAG_ARCHIVE="platypush-$VERSION.tar.gz"
-    - export GIT_BUILD_DIR="$WORKDIR/$GIT_PKG_NAME_$GIT_VERSION_all"
-    - export PKGNAME="$WORKDIR/$${GIT_PKG_NAME}_$${GIT_VERSION}.deb"
+    - export GIT_BUILD_DIR="$WORKDIR/$${GIT_PKG_NAME}_$${GIT_VERSION}_all"
+    - export GIT_PKGNAME="$GIT_BUILD_DIR/$${GIT_PKG_NAME}_$${GIT_VERSION}.deb"
 
     - echo "--- Building git package"
     - pip install --prefix="$GIT_BUILD_DIR" --no-cache --no-deps .
-    - mkdir -p "$GIT_BUILD_DIR/__all/DEBIAN"
+    - mkdir -p "$GIT_BUILD_DIR/DEBIAN"
     - |
-      cat <<EOF > "$GIT_BUILD_DIR/__all/DEBIAN/control"
+      cat <<EOF > "$GIT_BUILD_DIR/DEBIAN/control"
       Package: $GIT_PKG_NAME
       Version: $GIT_VERSION
       Maintainer: Fabio Manganiello <fabio@platypush.tech>
@@ -294,7 +294,7 @@ steps:
       Description: Universal command executor and automation hub.
       EOF
     - dpkg --build "$GIT_BUILD_DIR"
-    - aws s3 cp "$PKGNAME" s3://platypush-static/deb/git/
+    - aws s3 cp "$GIT_PKGNAME" s3://platypush-static/deb/git/
 
 - name: update-pip-package
   image: python:3.11-alpine