diff --git a/gitea-admin.sh b/gitea-admin.sh
index 9c24edd..60e3c3b 100644
--- a/gitea-admin.sh
+++ b/gitea-admin.sh
@@ -13,9 +13,15 @@ echo "Save GITEA_ADMIN_PASSWORD token to $INSTALL_ENV..."
 cd /data/gitea-init
 bash env-gen-install.sh GITEA_ADMIN_PASSWORD $GITEA_ADMIN_PASSWORD
 
-echo " Create admin user..."
-docker exec -it --user git gitea gitea admin user create --username $GIT_USER --password $GITEA_ADMIN_PASSWORD --email $ADMIN_EMAIL --admin
-docker exec -it --user git gitea gitea admin user list
+echo "Create Gitea admin user on server $SERVER_REMOTE_HOST..."
+ssh_cmd="
+docker exec -i --user git gitea gitea admin user create --username $GITEA_USER_NAME --password $GITEA_ADMIN_PASSWORD --email $ADMIN_EMAIL --admin --must-change-password=false
+docker exec -i --user git gitea gitea admin user list
+"
+
+echo "Connecting to server and executing command..."
+echo $ssh_cmd
+ssh -p $SERVER_SSH_PORT $SERVER_REMOTE_USER@$SERVER_REMOTE_HOST "$ssh_cmd"
 
 echo " Create admin access token..."
 TOKEN=$(curl -s -X POST "https://$GITEA_API_HOST/api/v1/users/$GITEA_USER_NAME/tokens" \
@@ -32,6 +38,7 @@ echo "Save GITEA_WRITE_USER_REPO token to $INSTALL_ENV..."
 cd /data/gitea-init
 bash env-gen-install.sh GITEA_WRITE_USER_REPO $TOKEN
 
+ssh-keygen -f ~/.ssh/known_hosts -R $GITEA_API_HOST
 
 echo "Add public SSH key to gitea app..."
 SSH_PUBLIC_KEY=$(cat ~/.ssh/id_ed25519.pub)
diff --git a/push-all.sh b/push-all.sh
index 8ec4b4e..824bd8d 100644
--- a/push-all.sh
+++ b/push-all.sh
@@ -3,7 +3,7 @@
 LIST_FILE="/data/gitea-init/repos.list"
 ENV_FILE="/data/gitea-init/install.env"
 
-trap 'echo -e "\033[31mcreate-all.sh: Something went wrong\033[0m"; exit 1' ERR
+trap 'echo -e "\033[31mpush-all.sh: Something went wrong\033[0m"; exit 1' ERR
 set -e
 
 echo "Checking for a repos.list file..."