diff --git a/.github/workflows/build-and-publish-from-dotfiles.yml b/.github/workflows/build-and-publish-from-dotfiles.yml
index 6261b3f..5c099d1 100644
--- a/.github/workflows/build-and-publish-from-dotfiles.yml
+++ b/.github/workflows/build-and-publish-from-dotfiles.yml
@@ -9,12 +9,12 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Sanitise Repository Owner
-        run: echo ::set-env name=REPOSITORY_OWNER::$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')
+        run: echo REPOSITORY_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
 
       - name: Build and Push to GitHub Container Registry
         uses: whoan/docker-build-with-cache-action@master
         with:
-          build_extra_args: --build-arg=DESKTOP_ENVIRONMENT_USER=${{ env.REPOSITORY_OWNER }} --build-arg=DOTFILES_CACHEBUST=${{ github.sha }}
+          build_extra_args: --build-arg=DESKTOP_ENVIRONMENT_USER=${{ env.REPOSITORY_OWNER }} --build-arg=DESKTOP_ENVIRONMENT_GITHUB_USER=${{ env.REPOSITORY_OWNER }} --build-arg=DOTFILES_CACHEBUST=${{ github.sha }}
           dockerfile: docker/Dockerfile
           image_name: desktop-environment
           push_git_tag: true
diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index fdf7020..1f975fa 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -9,12 +9,12 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Sanitise Repository Owner
-        run: echo ::set-env name=REPOSITORY_OWNER::$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')
+        run: echo REPOSITORY_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
 
       - name: Build and Push to GitHub Container Registry
         uses: whoan/docker-build-with-cache-action@master
         with:
-          build_extra_args: --build-arg=DESKTOP_ENVIRONMENT_USER=${{ env.REPOSITORY_OWNER }}
+          build_extra_args: --build-arg=DESKTOP_ENVIRONMENT_USER=${{ env.REPOSITORY_OWNER }} --build-arg=DESKTOP_ENVIRONMENT_GITHUB_USER=${{ env.REPOSITORY_OWNER }}
           dockerfile: docker/Dockerfile
           image_name: desktop-environment
           push_git_tag: true