diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index afb3b7bf..0eddae68 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
     - name: Get Image Tag
       id: get_tag
       run: |
-        export TARGET_IMAGE_TAG=$(if [ "${{ steps.get_branch.outputs.NAME }}" = "master" ]; then echo "latest"; else echo "${{ steps.get_branch.outputs.NAME }}"; fi)
+        export TARGET_IMAGE_TAG=$(if [ "${{ steps.get_branch.outputs.NAME }}" = "latest" ]; then echo "latest"; else echo "${{ steps.get_branch.outputs.NAME }}"; fi)
         echo $TARGET_IMAGE_TAG
         echo ::set-output name=NAME::${TARGET_IMAGE_TAG}
 
@@ -38,7 +38,7 @@ jobs:
     - name: Get Alternate Tag
       id: get_alt_tag
       run: |
-        export ALT_IMAGE_TAG=$(if [ "${{ steps.get_branch.outputs.NAME }}" = "master" ]; then echo "ubuntu"; else echo "${{ steps.get_branch.outputs.NAME }}-ubuntu"; fi)
+        export ALT_IMAGE_TAG=$(if [ "${{ steps.get_branch.outputs.NAME }}" = "latest" ]; then echo "ubuntu"; else echo "${{ steps.get_branch.outputs.NAME }}-ubuntu"; fi)
         echo $ALT_IMAGE_TAG
         echo ::set-output name=NAME::${ALT_IMAGE_TAG}
 
@@ -50,7 +50,7 @@ jobs:
 
     # login to github container registry
     - name: Login to Packages Container registry
-      uses: docker/login-action@v1 
+      uses: docker/login-action@v1
       if: github.repository == 'homebridge/docker-homebridge'
       with:
         registry: ghcr.io
@@ -73,4 +73,4 @@ jobs:
     - name: Build Image For Github Container Registry
       run: |
         docker buildx build --push -f Dockerfile --platform linux/amd64,linux/arm/v7,linux/arm64 -t ghcr.io/homebridge/homebridge:${{ steps.get_alt_tag.outputs.NAME }} .
-        docker buildx build --push -f Dockerfile --platform linux/amd64,linux/arm/v7,linux/arm64 -t ghcr.io/homebridge/homebridge:${{ steps.get_tag.outputs.NAME }} .
\ No newline at end of file
+        docker buildx build --push -f Dockerfile --platform linux/amd64,linux/arm/v7,linux/arm64 -t ghcr.io/homebridge/homebridge:${{ steps.get_tag.outputs.NAME }} .
diff --git a/homebridge.xml b/homebridge.xml
index 4a20f557..84209701 100644
--- a/homebridge.xml
+++ b/homebridge.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Containers>
-  <TemplateURL>https://raw.githubusercontent.com/homebridge/docker-homebridge/master/homebridge.xml</TemplateURL>
+  <TemplateURL>https://raw.githubusercontent.com/homebridge/docker-homebridge/latest/homebridge.xml</TemplateURL>
   <Beta>False</Beta>
   <Category>HomeAutomation Tools</Category>
   <Name>homebridge</Name>
@@ -34,7 +34,7 @@
   </Data>
   <Shell>bash</Shell>
   <WebUI>http://[IP]:[PORT:8581]/</WebUI>
-  <Icon>https://raw.githubusercontent.com/homebridge/branding/master/logos/homebridge-color-round-stylized.png</Icon>
+  <Icon>https://raw.githubusercontent.com/homebridge/branding/latest/logos/homebridge-color-round-stylized.png</Icon>
   <DonateText>If you find this project useful please STAR it on GitHub.</DonateText>
   <DonateLink>https://github.com/homebridge/docker-homebridge</DonateLink>
   <DonateImg>https://user-images.githubusercontent.com/3979615/96548396-85731300-12f9-11eb-9322-951083d43db1.png</DonateImg>