diff --git a/.drone.yml b/.drone.yml
index 2eb9716c6..740b6a2bb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -275,7 +275,6 @@ steps:
     - echo "--- Parsing metadata"
     - git config --global --add safe.directory $PWD
     - git pull --rebase origin master --tags
-    - export PY_VERSION=$(python3 --version | awk '{print $2}' | sed -re 's/^([0-9]+\.[0-9]+).*/\1/')
     - export VERSION=$(python3 setup.py --version)
     - export HEAD=$(git log --pretty=format:%h HEAD...HEAD~1)
     - export TAG_URL="https://git.platypush.tech/platypush/platypush/archive/v$VERSION.tar.gz"
@@ -285,12 +284,7 @@ steps:
     - export GIT_DEB="$WORKDIR/$${GIT_PKG_NAME}_$${GIT_VERSION}_all.deb"
 
     - echo "--- Building git package"
-    - pip install --prefix="$GIT_BUILD_DIR" --no-cache --no-deps .
-
-    - mkdir -p "$GIT_BUILD_DIR/usr/local"
-    - mv "$GIT_BUILD_DIR/usr/bin" "$GIT_BUILD_DIR/usr/local"
-    - mv "$GIT_BUILD_DIR/usr/lib" "$GIT_BUILD_DIR/usr/local"
-    - mv "$GIT_BUILD_DIR/usr/local/lib/python$${PY_VERSION}/site-packages" "$GIT_BUILD_DIR/usr/local/lib/python$${PY_VERSION}/dist-packages"
+    - pip install --prefix="$GIT_BUILD_DIR/usr" --no-cache --no-deps .
 
     - mkdir -p "$GIT_BUILD_DIR/DEBIAN"
     - |
@@ -338,7 +332,6 @@ steps:
     - echo "--- Parsing metadata"
     - git config --global --add safe.directory $PWD
     - git pull --rebase origin master --tags
-    - export PY_VERSION=$(python3 --version | awk '{print $2}' | sed -re 's/^([0-9]+\.[0-9]+).*/\1/')
     - export VERSION=$(python3 setup.py --version)
     - export HEAD=$(git log --pretty=format:%h HEAD...HEAD~1)
     - export TAG_URL="https://git.platypush.tech/platypush/platypush/archive/v$VERSION.tar.gz"
@@ -348,12 +341,7 @@ steps:
     - export GIT_DEB="$WORKDIR/$${GIT_PKG_NAME}_$${GIT_VERSION}_all.deb"
 
     - echo "--- Building git package"
-    - pip install --prefix="$GIT_BUILD_DIR" --no-cache --no-deps .
-
-    - mkdir -p "$GIT_BUILD_DIR/usr/local"
-    - mv "$GIT_BUILD_DIR/usr/bin" "$GIT_BUILD_DIR/usr/local"
-    - mv "$GIT_BUILD_DIR/usr/lib" "$GIT_BUILD_DIR/usr/local"
-    - mv "$GIT_BUILD_DIR/usr/local/lib/python$${PY_VERSION}/site-packages" "$GIT_BUILD_DIR/usr/local/lib/python$${PY_VERSION}/dist-packages"
+    - pip install --prefix="$GIT_BUILD_DIR/usr" --no-cache --no-deps .
 
     - mkdir -p "$GIT_BUILD_DIR/DEBIAN"
     - |