diff --git a/.drone.yml b/.drone.yml
index f84cb7b9..16d80bb3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,7 +20,7 @@ steps:
       # force by pass of ssh host key check, less secure
       - ssh-keyscan -H git.openprivacy.ca >> ~/.ssh/known_hosts
       # use Drone ssh var instead of hardcode to allow forks to build (gogs@git.openprivacy.ca:cwtch.im/cwtch-ui.git)
-      - git clone $DRONE_GIT_SSH_URL .
+      - git clone gogs@git.openprivacy.ca:$DRONE_REPO.git .
       - git checkout $DRONE_COMMIT
 
   - name: fetch
@@ -187,7 +187,7 @@ steps:
       - git init
       # -o UserKnownHostsFile=../known_hosts
       - git config core.sshCommand 'ssh -o StrictHostKeyChecking=no -i ../id_rsa'
-      - git remote add origin $Env:DRONE_GIT_SSH_URL
+      - git remote add origin gogs@git.openprivacy.ca:$Env:DRONE_REPO.git
       - git pull origin trunk
       - git fetch --tags
       - git checkout $Env:DRONE_COMMIT
diff --git a/linux/cwtch b/linux/cwtch
index 89dffb63..28f613a4 100755
--- a/linux/cwtch
+++ b/linux/cwtch
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-env LD_LIBRARY_PATH=./lib/ ./lib/cwtch
\ No newline at end of file
+exec env LD_LIBRARY_PATH=./lib/ ./lib/cwtch
diff --git a/linux/cwtch.home.sh b/linux/cwtch.home.sh
index 4e081cbe..44f55253 100755
--- a/linux/cwtch.home.sh
+++ b/linux/cwtch.home.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-env LD_LIBRARY_PATH=~/.local/lib/cwtch/ ~/.local/lib/cwtch/cwtch
\ No newline at end of file
+exec env LD_LIBRARY_PATH=~/.local/lib/cwtch/ ~/.local/lib/cwtch/cwtch
diff --git a/linux/cwtch.sys.sh b/linux/cwtch.sys.sh
index bec6bcc5..8a927666 100755
--- a/linux/cwtch.sys.sh
+++ b/linux/cwtch.sys.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-env LD_LIBRARY_PATH=/usr/lib/cwtch /usr/lib/cwtch/cwtch
\ No newline at end of file
+exec env LD_LIBRARY_PATH=/usr/lib/cwtch /usr/lib/cwtch/cwtch