diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml
index cecb19b..9ae45d7 100644
--- a/.drone/drone-home.yml
+++ b/.drone/drone-home.yml
@@ -42,7 +42,7 @@ steps:
     - drone_gitea_server
     - drone_server_host
     - ssh_host
-    - ssh_user
+    - ssh_username
     - ssh_port
     - drone_gitea_client_secret
     - drone_rpc_secret
@@ -61,12 +61,11 @@ steps:
     - "echo \"export DRONE_GITEA_SERVER='$${DRONE_GITEA_SERVER}'\" >> env-drone # \"drone-gitea-server\""
     - "echo \"export DRONE_SERVER_HOST='$${DRONE_SERVER_HOST}'\" >> env-drone # \"drone-server-host\""
     - "echo \"export SSH_HOST='$${SSH_HOST}'\" >> env-drone # \"ssh-host\""
-    - "echo \"export SSH_USER='$${SSH_USER}'\" >> env-drone # \"ssh-user\""
+    - "echo \"export SSH_USERNAME='$${SSH_USERNAME}'\" >> env-drone # \"ssh-username\""
     - "echo \"export SSH_PORT='$${SSH_PORT}'\" >> env-drone # \"ssh-port\""
     - "echo \"export DRONE_GITEA_CLIENT_SECRET='$${DRONE_GITEA_CLIENT_SECRET}'\" >> env-drone # \"drone-gitea-client-secret\""
     - "echo \"export DRONE_RPC_SECRET='$${DRONE_RPC_SECRET}'\" >> env-drone # \"drone-rpc-secret\""
     - "echo \"export SSH_KEY='$${SSH_KEY}'\" >> env-drone # \"ssh-key\""
-    username: ${SSH_USER}
   environment:
     DOMAIN:
       from_secret: domain
@@ -92,8 +91,8 @@ steps:
       from_secret: ssh-key
     SSH_PORT:
       from_secret: ssh-port
-    SSH_USER:
-      from_secret: ssh-user
+    SSH_USERNAME:
+      from_secret: ssh-username
 
 - name: scp
   image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47
@@ -106,7 +105,6 @@ steps:
     source:
     - .
     target: /stack/drone
-    username: ${SSH_USER}
 
 - name: wait
   image: alpine:3.12.0@sha256:90baa0922fe90624b05cb5766fa5da4e337921656c2f8e2b13bd3c052a0baac1
@@ -146,7 +144,7 @@ steps:
     - drone_gitea_server
     - drone_server_host
     - ssh_host
-    - ssh_user
+    - ssh_username
     - ssh_port
     - drone_gitea_client_secret
     - drone_rpc_secret
@@ -167,7 +165,7 @@ steps:
     - export DRONE_GITEA_SERVER=$${DRONE_GITEA_SERVER}
     - export DRONE_SERVER_HOST=$${DRONE_SERVER_HOST}
     - export SSH_HOST=$${SSH_HOST}
-    - export SSH_USER=$${SSH_USER}
+    - export SSH_USERNAME=$${SSH_USERNAME}
     - export SSH_PORT=$${SSH_PORT}
     - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
     - export REGISTRY_PORT=$${REGISTRY_PORT}
@@ -177,7 +175,6 @@ steps:
     - sh .drone/login.sh
     - sh .drone/pull.sh
     - sh .drone/deploy.sh
-    username: ${SSH_USER}
   environment:
     DOMAIN:
       from_secret: domain
@@ -203,8 +200,8 @@ steps:
       from_secret: ssh-key
     SSH_PORT:
       from_secret: ssh-port
-    SSH_USER:
-      from_secret: ssh-user
+    SSH_USERNAME:
+      from_secret: ssh-username
 
 services:
 - name: docker
diff --git a/.drone/drone.yml b/.drone/drone.yml
index 2e94b6c..f082f31 100644
--- a/.drone/drone.yml
+++ b/.drone/drone.yml
@@ -42,7 +42,7 @@ steps:
     - drone_gitea_server
     - drone_server_host
     - ssh_host
-    - ssh_user
+    - ssh_username
     - ssh_port
     - drone_gitea_client_secret
     - drone_rpc_secret
@@ -61,12 +61,11 @@ steps:
     - "echo \"export DRONE_GITEA_SERVER='$${DRONE_GITEA_SERVER}'\" >> env-drone # \"drone-gitea-server\""
     - "echo \"export DRONE_SERVER_HOST='$${DRONE_SERVER_HOST}'\" >> env-drone # \"drone-server-host\""
     - "echo \"export SSH_HOST='$${SSH_HOST}'\" >> env-drone # \"ssh-host\""
-    - "echo \"export SSH_USER='$${SSH_USER}'\" >> env-drone # \"ssh-user\""
+    - "echo \"export SSH_USERNAME='$${SSH_USERNAME}'\" >> env-drone # \"ssh-username\""
     - "echo \"export SSH_PORT='$${SSH_PORT}'\" >> env-drone # \"ssh-port\""
     - "echo \"export DRONE_GITEA_CLIENT_SECRET='$${DRONE_GITEA_CLIENT_SECRET}'\" >> env-drone # \"drone-gitea-client-secret\""
     - "echo \"export DRONE_RPC_SECRET='$${DRONE_RPC_SECRET}'\" >> env-drone # \"drone-rpc-secret\""
     - "echo \"export SSH_KEY='$${SSH_KEY}'\" >> env-drone # \"ssh-key\""
-    #username: giles
   environment:
     DOMAIN:
       from_secret: domain
@@ -93,8 +92,8 @@ steps:
     SSH_PORT:
       from_secret: ssh-port
     SSH_USERNAME:
-      from_secret: ssh-user
-    
+      from_secret: ssh-username
+
 - name: scp
   image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47
   settings:
@@ -106,7 +105,6 @@ steps:
     source:
     - .
     target: /stack/drone
-    username: ${SSH_USER}
 
 - name: wait
   image: alpine:3.12.0@sha256:90baa0922fe90624b05cb5766fa5da4e337921656c2f8e2b13bd3c052a0baac1
@@ -146,7 +144,7 @@ steps:
     - drone_gitea_server
     - drone_server_host
     - ssh_host
-    - ssh_user
+    - ssh_username
     - ssh_port
     - drone_gitea_client_secret
     - drone_rpc_secret
@@ -167,7 +165,7 @@ steps:
     - export DRONE_GITEA_SERVER=$${DRONE_GITEA_SERVER}
     - export DRONE_SERVER_HOST=$${DRONE_SERVER_HOST}
     - export SSH_HOST=$${SSH_HOST}
-    - export SSH_USER=$${SSH_USER}
+    - export SSH_USERNAME=$${SSH_USERNAME}
     - export SSH_PORT=$${SSH_PORT}
     - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
     - export REGISTRY_PORT=$${REGISTRY_PORT}
@@ -177,7 +175,6 @@ steps:
     - sh .drone/login.sh
     - sh .drone/pull.sh
     - sh .drone/deploy.sh
-    username: ${SSH_USER}
   environment:
     DOMAIN:
       from_secret: domain
@@ -203,8 +200,8 @@ steps:
       from_secret: ssh-key
     SSH_PORT:
       from_secret: ssh-port
-    SSH_USER:
-      from_secret: ssh-user
+    SSH_USERNAME:
+      from_secret: ssh-username
 
 services:
 - name: docker
diff --git a/.drone/lib/public-secrets.libsonnet b/.drone/lib/public-secrets.libsonnet
index 60f7fea..bb253d7 100644
--- a/.drone/lib/public-secrets.libsonnet
+++ b/.drone/lib/public-secrets.libsonnet
@@ -4,6 +4,6 @@
   'drone-gitea-server',
   'drone-server-host',
   'ssh-host',
-  'ssh-user',
+  'ssh-username',
   'ssh-port'
 ]
diff --git a/git-hooks/pre-commit.old b/git-hooks/pre-commit
similarity index 100%
rename from git-hooks/pre-commit.old
rename to git-hooks/pre-commit