diff --git a/.github/workflows/build-flatpak.yml b/.github/workflows/build-flatpak.yml
index b9197b9768..e283f1d12f 100644
--- a/.github/workflows/build-flatpak.yml
+++ b/.github/workflows/build-flatpak.yml
@@ -127,7 +127,7 @@ jobs:
         # Install required runtimes
         sudo flatpak install -y flathub org.gnome.Platform//47
         sudo flatpak install -y flathub org.gnome.Sdk//47
-        sudo flatpak install -y flathub org.freedesktop.Sdk.Extension.openjdk17//24.08
+        sudo flatpak install -y flathub org.freedesktop.Sdk.Extension.openjdk17
 
     - name: Setup Flatpak builder cache
       uses: actions/cache@v4
diff --git a/flatpak/org.sleuthkit.Autopsy.yml b/flatpak/org.sleuthkit.Autopsy.yml
index bbc7d93853..69e2756d7b 100644
--- a/flatpak/org.sleuthkit.Autopsy.yml
+++ b/flatpak/org.sleuthkit.Autopsy.yml
@@ -3,7 +3,7 @@ runtime: org.gnome.Platform
 runtime-version: '47'
 sdk: org.gnome.Sdk
 sdk-extensions:
-  - org.freedesktop.Sdk.Extension.openjdk17//24.08
+  - org.freedesktop.Sdk.Extension.openjdk17
 command: autopsy
 finish-args:
   # Filesystem access - Autopsy needs broad access for forensic analysis
@@ -45,12 +45,6 @@ finish-args:
   - --filesystem=/mnt:rw
   - --filesystem=/media:rw
   
-environment:
-  JAVA_HOME: /app/jre
-  TSK_HOME: /app
-  SOLR_JAVA_HOME: /app/jre
-  PATH: /app/bin:/app/jre/bin:/usr/bin
-
 modules:
   # OpenJDK 17 Runtime
   - name: openjdk