diff --git a/system_files/deck/shared/usr/share/ublue-os/just/custom.just b/system_files/deck/shared/usr/share/ublue-os/just/custom.just
index 770b8cdd..2a610036 100644
--- a/system_files/deck/shared/usr/share/ublue-os/just/custom.just
+++ b/system_files/deck/shared/usr/share/ublue-os/just/custom.just
@@ -284,27 +284,6 @@ _toggle_wayland:
   fi
 
 sign-image:
-  rpm-ostree rebase ostree-image-signed:$(just --unstable _get-image)
-
-_get-image:
-  #!/usr/bin/env python
-  from json import loads
-  from subprocess import PIPE, run
-
-  """Pull deployment status via rpm-ostree"""
-  status = "rpm-ostree status --json"
-  out = run(status, shell=True, stdout=PIPE).stdout
-
-  """Parse current image"""
-  deployments = loads(out)["deployments"][0]
-  current_image = deployments["container-image-reference"].split(":", 1)
-
-  """Dissect current image to form URL to latest image"""
-  protocol = "docker://"
-  url = current_image[1]
-
-  """Add protocol if URL doesn't contain it"""
-  if protocol not in url:
-    url = protocol + url
-
-  print(url)
+  #!/usr/bin/env bash
+  source /etc/default/bazzite
+  rpm-ostree rebase ostree-image-signed:docker://ghcr.io/${IMAGE_VENDOR}/${IMAGE_NAME}:${FEDORA_MAJOR_VERSION}
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/custom.just b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
index f7d46af6..cdb76af8 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
@@ -193,27 +193,6 @@ unhide-grub:
   fi
 
 sign-image:
-  rpm-ostree rebase ostree-image-signed:$(just --unstable _get-image)
-
-_get-image:
-  #!/usr/bin/env python
-  from json import loads
-  from subprocess import PIPE, run
-
-  """Pull deployment status via rpm-ostree"""
-  status = "rpm-ostree status --json"
-  out = run(status, shell=True, stdout=PIPE).stdout
-
-  """Parse current image"""
-  deployments = loads(out)["deployments"][0]
-  current_image = deployments["container-image-reference"].split(":", 1)
-
-  """Dissect current image to form URL to latest image"""
-  protocol = "docker://"
-  url = current_image[1]
-
-  """Add protocol if URL doesn't contain it"""
-  if protocol not in url:
-    url = protocol + url
-
-  print(url)
+  #!/usr/bin/env bash
+  source /etc/default/bazzite
+  rpm-ostree rebase ostree-image-signed:docker://ghcr.io/${IMAGE_VENDOR}/${IMAGE_NAME}:${FEDORA_MAJOR_VERSION}