diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
index 2210f50..8ca6fcf 100644
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -29,7 +29,7 @@ jobs:
           echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
           echo "> External trigger running off of master branch. To disable this trigger, add \`gitqlient_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
           printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
-          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/francescmm/GitQlient/releases/latest" | jq -r '. | .tag_name')
+          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/francescmaestre/GitQlient/releases/latest" | jq -r '. | .tag_name')
           echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY
           if grep -q "^gitqlient_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
diff --git a/Dockerfile b/Dockerfile
index a2c7244..1837dea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,16 +11,17 @@ RUN \
 
 RUN \
   echo "**** grab source ****" && \
-  git clone https://github.com/francescmm/GitQlient.git
+  git clone https://github.com/francescmaestre/GitQlient.git
 
 RUN \
   echo "**** build gitqclient ****" && \
   mkdir -p /build-out/usr && \
   if [ -z ${GITQLIENT_RELEASE+x} ]; then \
-    GITQLIENT_RELEASE=$(curl -sX GET "https://api.github.com/repos/francescmm/GitQlient/releases/latest" \
+    GITQLIENT_RELEASE=$(curl -sX GET "https://api.github.com/repos/francescmaestre/GitQlient/releases/latest" \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \
   fi && \
   cd /GitQlient && \
+  git checkout "${GITQLIENT_RELEASE}" && \
   qmake-qt5 GitQlient.pro \
     PREFIX=/build-out/usr \
     VERSION=${GITQLIENT_RELEASE:1} && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 1b3757a..c5f6b65 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -11,16 +11,17 @@ RUN \
 
 RUN \
   echo "**** grab source ****" && \
-  git clone https://github.com/francescmm/GitQlient.git
+  git clone https://github.com/francescmaestre/GitQlient.git
 
 RUN \
   echo "**** build gitqclient ****" && \
   mkdir -p /build-out/usr && \
   if [ -z ${GITQLIENT_RELEASE+x} ]; then \
-    GITQLIENT_RELEASE=$(curl -sX GET "https://api.github.com/repos/francescmm/GitQlient/releases/latest" \
+    GITQLIENT_RELEASE=$(curl -sX GET "https://api.github.com/repos/francescmaestre/GitQlient/releases/latest" \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \
   fi && \
   cd /GitQlient && \
+  git checkout "${GITQLIENT_RELEASE}" && \
   qmake-qt5 GitQlient.pro \
     PREFIX=/build-out/usr \
     VERSION=${GITQLIENT_RELEASE:1} && \
diff --git a/Jenkinsfile b/Jenkinsfile
index 1108289..3a4d86b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
     QUAYIO_API_TOKEN=credentials('quayio-repo-api-token')
     GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f')
     EXT_GIT_BRANCH = 'master'
-    EXT_USER = 'francescmm'
+    EXT_USER = 'francescmaestre'
     EXT_REPO = 'GitQlient'
     BUILD_VERSION_ARG = 'GITQLIENT_RELEASE'
     LS_USER = 'linuxserver'
diff --git a/README.md b/README.md
index af1da1d..5a13b0b 100644
--- a/README.md
+++ b/README.md
@@ -88,6 +88,7 @@ This container is based on [Docker Baseimage Selkies](https://github.com/linuxse
 | :----: | --- |
 | `CUSTOM_PORT` | Internal HTTP port. Defaults to `3000`. |
 | `CUSTOM_HTTPS_PORT` | Internal HTTPS port. Defaults to `3001`. |
+| `CUSTOM_WS_PORT` | Internal port the container listens on for websockets if it needs to be swapped from the default 8082. |
 | `CUSTOM_USER` | Username for HTTP Basic Auth. Defaults to `abc`. |
 | `PASSWORD` | Password for HTTP Basic Auth. If unset, authentication is disabled. |
 | `SUBFOLDER` | Application subfolder for reverse proxy configurations. Must include leading and trailing slashes, e.g., `/subfolder/`. |
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index ac7f85a..ce71f09 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -9,7 +9,7 @@ ls_branch: master
 build_armhf: false
 repo_vars:
   - EXT_GIT_BRANCH = 'master'
-  - EXT_USER = 'francescmm'
+  - EXT_USER = 'francescmaestre'
   - EXT_REPO = 'GitQlient'
   - BUILD_VERSION_ARG = 'GITQLIENT_RELEASE'
   - LS_USER = 'linuxserver'