diff --git a/LibericaMissionControl/libericamissioncontrol.nuspec b/LibericaMissionControl/libericamissioncontrol.nuspec
index 379704e..e74f62e 100644
--- a/LibericaMissionControl/libericamissioncontrol.nuspec
+++ b/LibericaMissionControl/libericamissioncontrol.nuspec
@@ -4,6 +4,7 @@
     <id>liberica-mission-control</id>
     <version>8.3.0</version>
     <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/LibericaMissionControl</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica Mission Control 64 bit only</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/corretto-jdk-11/corretto11jdk.nuspec b/corretto-jdk-11/corretto11jdk.nuspec
index 305ec3a..ac18403 100644
--- a/corretto-jdk-11/corretto11jdk.nuspec
+++ b/corretto-jdk-11/corretto11jdk.nuspec
@@ -4,7 +4,7 @@
     <id>corretto11jdk</id>
     <version>11.0.21</version>
     <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages/tree/master/corretto-jdk-11</packageSourceUrl>
-    <iconUrl>https://github.com/ajshastri/chocolatey-packages/blob/f9378c711fe408139f2fbd470e0b51f7d34eb5a0/icons/aws-corretto.jpg</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/aws-corretto.png</iconUrl>
     <title>Corretto 11 JDK</title>
     <authors>Amazon</authors>
     <owners>JohanJanssen</owners>
diff --git a/corretto-jdk-17/corretto17jdk.nuspec b/corretto-jdk-17/corretto17jdk.nuspec
index 084fd74..ef5c2e5 100644
--- a/corretto-jdk-17/corretto17jdk.nuspec
+++ b/corretto-jdk-17/corretto17jdk.nuspec
@@ -4,7 +4,7 @@
     <id>corretto17jdk</id>
     <version>17.0.9</version>
     <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages/tree/master/corretto-jdk-17</packageSourceUrl>
-    <iconUrl>https://github.com/ajshastri/chocolatey-packages/blob/f9378c711fe408139f2fbd470e0b51f7d34eb5a0/icons/aws-corretto.jpg</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/aws-corretto.png</iconUrl>
     <title>Corretto 17 JDK</title>
     <authors>Amazon</authors>
     <owners>JohanJanssen</owners>
diff --git a/corretto-jdk-21/corretto21jdk.nuspec b/corretto-jdk-21/corretto21jdk.nuspec
index babf5fb..5e8fe9a 100644
--- a/corretto-jdk-21/corretto21jdk.nuspec
+++ b/corretto-jdk-21/corretto21jdk.nuspec
@@ -4,7 +4,7 @@
     <id>corretto21jdk</id>
     <version>21.0.1</version>
     <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages/tree/master/corretto-jdk-21</packageSourceUrl>
-    <iconUrl>https://github.com/ajshastri/chocolatey-packages/blob/f9378c711fe408139f2fbd470e0b51f7d34eb5a0/icons/aws-corretto.jpg</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/aws-corretto.png</iconUrl>
     <title>Corretto JDK</title>
     <authors>Amazon</authors>
     <owners>JohanJanssen</owners>
diff --git a/corretto-jdk-8/corretto8jdk.nuspec b/corretto-jdk-8/corretto8jdk.nuspec
index a57af14..0a938af 100644
--- a/corretto-jdk-8/corretto8jdk.nuspec
+++ b/corretto-jdk-8/corretto8jdk.nuspec
@@ -4,7 +4,7 @@
     <id>corretto8jdk</id>
     <version>8.392</version>
     <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages/tree/master/corretto-jdk-8</packageSourceUrl>
-    <iconUrl>https://github.com/ajshastri/chocolatey-packages/blob/f9378c711fe408139f2fbd470e0b51f7d34eb5a0/icons/aws-corretto.jpg</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/aws-corretto.png</iconUrl>
     <title>Corretto 8 JDK</title>
     <authors>Amazon</authors>
     <owners>JohanJanssen</owners>
diff --git a/corretto-jdk/correttojdk.nuspec b/corretto-jdk/correttojdk.nuspec
index 89b521b..89e0a8d 100644
--- a/corretto-jdk/correttojdk.nuspec
+++ b/corretto-jdk/correttojdk.nuspec
@@ -3,8 +3,8 @@
   <metadata>
     <id>correttojdk</id>
     <version>21.0.1</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/CorrettoJDK</packageSourceUrl>
-    <iconUrl>https://github.com/ajshastri/chocolatey-packages/blob/f9378c711fe408139f2fbd470e0b51f7d34eb5a0/icons/aws-corretto.jpg</iconUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages/tree/master/corretto-jdk</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/aws-corretto.png</iconUrl>
     <title>Corretto JDK</title>
     <authors>Amazon</authors>
     <owners>JohanJanssen</owners>
diff --git a/corretto-jre-8/corretto8jre.nuspec b/corretto-jre-8/corretto8jre.nuspec
index 65e3073..e9565c1 100644
--- a/corretto-jre-8/corretto8jre.nuspec
+++ b/corretto-jre-8/corretto8jre.nuspec
@@ -4,7 +4,7 @@
     <id>corretto8jre</id>
     <version>8.392</version>
     <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages/tree/master/corretto-jre-8</packageSourceUrl>
-    <iconUrl>https://github.com/ajshastri/chocolatey-packages/blob/f9378c711fe408139f2fbd470e0b51f7d34eb5a0/icons/aws-corretto.jpg</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/aws-corretto.png</iconUrl>
     <title>Corretto 8 JRE</title>
     <authors>Amazon</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-11-jdk/liberica11jdk.nuspec b/liberica-11-jdk/liberica11jdk.nuspec
index 168fee6..daaad40 100644
--- a/liberica-11-jdk/liberica11jdk.nuspec
+++ b/liberica-11-jdk/liberica11jdk.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>liberica11jdk</id>
     <version>11.0.21</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/Liberica11JDK</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica 11 JDK</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-11-jdkfull/liberica11jdkfull.nuspec b/liberica-11-jdkfull/liberica11jdkfull.nuspec
index deb8eab..7c75c22 100644
--- a/liberica-11-jdkfull/liberica11jdkfull.nuspec
+++ b/liberica-11-jdkfull/liberica11jdkfull.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>liberica11jdkfull</id>
     <version>11.0.21</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/Liberica11JDK</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica 11 JDK full includes LibericaFX and Minimal VM</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-11-jre/liberica11jre.nuspec b/liberica-11-jre/liberica11jre.nuspec
index 956d5d0..b7a76d4 100644
--- a/liberica-11-jre/liberica11jre.nuspec
+++ b/liberica-11-jre/liberica11jre.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>liberica11jre</id>
     <version>11.0.21</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/Liberica11JDK</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica 11 JRE</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-11-jrefull/liberica11jrefull.nuspec b/liberica-11-jrefull/liberica11jrefull.nuspec
index 9494104..fa858a2 100644
--- a/liberica-11-jrefull/liberica11jrefull.nuspec
+++ b/liberica-11-jrefull/liberica11jrefull.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>liberica11jrefull</id>
     <version>11.0.21</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/Liberica11JREFull</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica 11 JRE full includes LibericaFX and Minimal VM</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-17-jdk/liberica17jdk.nuspec b/liberica-17-jdk/liberica17jdk.nuspec
index 24d6b27..1bee788 100644
--- a/liberica-17-jdk/liberica17jdk.nuspec
+++ b/liberica-17-jdk/liberica17jdk.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>liberica17jdk</id>
     <version>17.0.9</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/Liberica17JDK</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica 17 JDK</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-17-jdkfull/liberica17jdkfull.nuspec b/liberica-17-jdkfull/liberica17jdkfull.nuspec
index b67a9c8..c5796d7 100644
--- a/liberica-17-jdkfull/liberica17jdkfull.nuspec
+++ b/liberica-17-jdkfull/liberica17jdkfull.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>liberica17jdkfull</id>
     <version>17.0.9</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/Liberica17JDKFull</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica 17 JDK full includes LibericaFX and Minimal VM</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-17-jdklite/liberica17jdklite.nuspec b/liberica-17-jdklite/liberica17jdklite.nuspec
index 85fa359..c14477b 100644
--- a/liberica-17-jdklite/liberica17jdklite.nuspec
+++ b/liberica-17-jdklite/liberica17jdklite.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>liberica17jdklite</id>
     <version>17.0.9</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/Liberica17JDKLite</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica 17 JDK lite modules are compressed without the javafx modules </title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-17-jre/liberica17jre.nuspec b/liberica-17-jre/liberica17jre.nuspec
index cec04f7..6bd2e44 100644
--- a/liberica-17-jre/liberica17jre.nuspec
+++ b/liberica-17-jre/liberica17jre.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>liberica17jre</id>
     <version>17.0.9</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/Liberica17JRE</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica 17 JRE</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-17-jrefull/liberica17jrefull.nuspec b/liberica-17-jrefull/liberica17jrefull.nuspec
index 0d0dd3a..053783f 100644
--- a/liberica-17-jrefull/liberica17jrefull.nuspec
+++ b/liberica-17-jrefull/liberica17jrefull.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>liberica17jrefull</id>
     <version>17.0.9</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/Liberica17JREFull</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica 17 JRE full includes LibericaFX and Minimal VM</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-21-jdk/liberica21jdk.nuspec b/liberica-21-jdk/liberica21jdk.nuspec
index 7444cee..815947b 100644
--- a/liberica-21-jdk/liberica21jdk.nuspec
+++ b/liberica-21-jdk/liberica21jdk.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>liberica21jdk</id>
     <version>21.0.1.12</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/LibericaJDK</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica JDK</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-21-jdkfull/liberica21jdkfull.nuspec b/liberica-21-jdkfull/liberica21jdkfull.nuspec
index c1287ba..b9d7476 100644
--- a/liberica-21-jdkfull/liberica21jdkfull.nuspec
+++ b/liberica-21-jdkfull/liberica21jdkfull.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>liberica21jdkfull</id>
     <version>21.0.1.12</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/LibericaJDKFull</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica JDK full includes LibericaFX and Minimal VM</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-21-jdklite/liberica21jdklite.nuspec b/liberica-21-jdklite/liberica21jdklite.nuspec
index ca694a9..e030688 100644
--- a/liberica-21-jdklite/liberica21jdklite.nuspec
+++ b/liberica-21-jdklite/liberica21jdklite.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>liberica21jdklite</id>
     <version>21.0.1.12</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/LibericaJDKLite</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica JDK lite modules are compressed without the javafx modules </title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-21-jre/liberica21jre.nuspec b/liberica-21-jre/liberica21jre.nuspec
index d686f96..1671a6c 100644
--- a/liberica-21-jre/liberica21jre.nuspec
+++ b/liberica-21-jre/liberica21jre.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>liberica21jre</id>
     <version>21.0.1.12</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/LibericaJRE</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica JRE</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-21-jrefull/liberica21jrefull.nuspec b/liberica-21-jrefull/liberica21jrefull.nuspec
index f5791e8..96c3770 100644
--- a/liberica-21-jrefull/liberica21jrefull.nuspec
+++ b/liberica-21-jrefull/liberica21jrefull.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>liberica21jrefull</id>
     <version>21.0.1.12</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/LibericaJREFull</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica JRE full includes LibericaFX and Minimal VM</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-8-jdk/liberica8jdk.nuspec b/liberica-8-jdk/liberica8jdk.nuspec
index 3becc46..a449f5f 100644
--- a/liberica-8-jdk/liberica8jdk.nuspec
+++ b/liberica-8-jdk/liberica8jdk.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>liberica8jdk</id>
     <version>8.0.392</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/Liberica8JDK</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages/tree/master/liberica-8-jdk</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica 8 JDK</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-8-jre/liberica8jre.nuspec b/liberica-8-jre/liberica8jre.nuspec
index bbaa579..82a81a5 100644
--- a/liberica-8-jre/liberica8jre.nuspec
+++ b/liberica-8-jre/liberica8jre.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>liberica8jre</id>
     <version>8.0.392</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/Liberica8JDK</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages/tree/master/liberica-8-jre</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica 8 JRE</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-jdk/libericajdk.nuspec b/liberica-jdk/libericajdk.nuspec
index 2291652..9fcae4b 100644
--- a/liberica-jdk/libericajdk.nuspec
+++ b/liberica-jdk/libericajdk.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>libericajdk</id>
     <version>21.0.1.12</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/LibericaJDK</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica JDK</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-jdkfull/libericajdkfull.nuspec b/liberica-jdkfull/libericajdkfull.nuspec
index 8900bea..13c5659 100644
--- a/liberica-jdkfull/libericajdkfull.nuspec
+++ b/liberica-jdkfull/libericajdkfull.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>libericajdkfull</id>
     <version>21.0.1.12</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/LibericaJDKFull</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica JDK full includes LibericaFX and Minimal VM</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-jdklite/libericajdklite.nuspec b/liberica-jdklite/libericajdklite.nuspec
index 02aa9b8..01f8f40 100644
--- a/liberica-jdklite/libericajdklite.nuspec
+++ b/liberica-jdklite/libericajdklite.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>libericajdklite</id>
     <version>21.0.1.12</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/LibericaJDKLite</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica JDK lite modules are compressed without the javafx modules </title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-jre/libericajre.nuspec b/liberica-jre/libericajre.nuspec
index 451dfd1..1b1e4d0 100644
--- a/liberica-jre/libericajre.nuspec
+++ b/liberica-jre/libericajre.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>libericajre</id>
     <version>21.0.1.12</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/LibericaJRE</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica JRE</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/liberica-jrefull/libericajrefull.nuspec b/liberica-jrefull/libericajrefull.nuspec
index 60dbc45..fb2b5c5 100644
--- a/liberica-jrefull/libericajrefull.nuspec
+++ b/liberica-jrefull/libericajrefull.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>libericajrefull</id>
     <version>21.0.1.12</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/LibericaJREFull</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/bell_sw_logo.png</iconUrl>
     <title>Liberica JRE full includes LibericaFX and Minimal VM</title>
     <authors>BellSoft</authors>
     <owners>JohanJanssen</owners>
diff --git a/sapmachine-11-jdk/sapmachine11.nuspec b/sapmachine-11-jdk/sapmachine11.nuspec
index 35f3533..ce6c244 100644
--- a/sapmachine-11-jdk/sapmachine11.nuspec
+++ b/sapmachine-11-jdk/sapmachine11.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>sapmachine11</id>
     <version>11.0.21</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/SapMachine11</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/sapmachine.png</iconUrl>
     <title>SapMachine 11</title>
     <authors>SAP</authors>
     <owners>JohanJanssen</owners>
diff --git a/sapmachine-11-jre/sapmachine11jre.nuspec b/sapmachine-11-jre/sapmachine11jre.nuspec
index 44516f4..07e7f97 100644
--- a/sapmachine-11-jre/sapmachine11jre.nuspec
+++ b/sapmachine-11-jre/sapmachine11jre.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>sapmachine11jre</id>
     <version>11.0.21</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/SapMachine11</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/sapmachine.png</iconUrl>
     <title>SapMachine 11 JRE</title>
     <authors>SAP</authors>
     <owners>JohanJanssen</owners>
diff --git a/sapmachine-17-jdk/sapmachine17.nuspec b/sapmachine-17-jdk/sapmachine17.nuspec
index 7e88d12..fa907fc 100644
--- a/sapmachine-17-jdk/sapmachine17.nuspec
+++ b/sapmachine-17-jdk/sapmachine17.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>sapmachine17</id>
     <version>17.0.9</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/SapMachine17</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/sapmachine.png</iconUrl>
     <title>SapMachine 17 JDK</title>
     <authors>SAP</authors>
     <owners>JohanJanssen</owners>
diff --git a/sapmachine-17-jre/sapmachine17jre.nuspec b/sapmachine-17-jre/sapmachine17jre.nuspec
index bd0e23b..52c136a 100644
--- a/sapmachine-17-jre/sapmachine17jre.nuspec
+++ b/sapmachine-17-jre/sapmachine17jre.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>sapmachine17jre</id>
     <version>17.0.9</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/SapMachine17JRE</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/sapmachine.png</iconUrl>
     <title>SapMachine 17 JRE</title>
     <authors>SAP</authors>
     <owners>JohanJanssen</owners>
diff --git a/sapmachine-21-jdk/sapmachine21.nuspec b/sapmachine-21-jdk/sapmachine21.nuspec
index ae829b3..ac699e5 100644
--- a/sapmachine-21-jdk/sapmachine21.nuspec
+++ b/sapmachine-21-jdk/sapmachine21.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>sapmachine21</id>
     <version>21.0.1</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/SapMachine21</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/sapmachine.png</iconUrl>
     <title>SapMachine JDK</title>
     <authors>SAP</authors>
     <owners>JohanJanssen</owners>
diff --git a/sapmachine-21-jre/sapmachine21jre.nuspec b/sapmachine-21-jre/sapmachine21jre.nuspec
index 7adb132..e1368ca 100644
--- a/sapmachine-21-jre/sapmachine21jre.nuspec
+++ b/sapmachine-21-jre/sapmachine21jre.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>sapmachine21jre</id>
     <version>21.0.1</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/SapMachine21JRE</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/sapmachine.png</iconUrl>
     <title>SapMachine JRE</title>
     <authors>SAP</authors>
     <owners>JohanJanssen</owners>
diff --git a/sapmachine-jdk/sapmachine.nuspec b/sapmachine-jdk/sapmachine.nuspec
index e9bbcfa..781e3f5 100644
--- a/sapmachine-jdk/sapmachine.nuspec
+++ b/sapmachine-jdk/sapmachine.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>sapmachine</id>
     <version>21.0.1</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/SapMachine</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/sapmachine.png</iconUrl>
     <title>SapMachine JDK</title>
     <authors>SAP</authors>
     <owners>JohanJanssen</owners>
diff --git a/sapmachine-jre/sapmachinejre.nuspec b/sapmachine-jre/sapmachinejre.nuspec
index 9b08e26..750514a 100644
--- a/sapmachine-jre/sapmachinejre.nuspec
+++ b/sapmachine-jre/sapmachinejre.nuspec
@@ -3,7 +3,8 @@
   <metadata>
     <id>sapmachinejre</id>
     <version>21.0.1</version>
-    <packageSourceUrl>https://github.com/johanjanssen/ChocolateyPackages/tree/master/SapMachineJRE</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/sapmachine.png</iconUrl>
     <title>SapMachine JRE</title>
     <authors>SAP</authors>
     <owners>JohanJanssen</owners>
diff --git a/temurin-11-jdk/temurin11.nuspec b/temurin-11-jdk/temurin11.nuspec
index c3479e5..b531259 100644
--- a/temurin-11-jdk/temurin11.nuspec
+++ b/temurin-11-jdk/temurin11.nuspec
@@ -3,13 +3,13 @@
   <metadata>
     <id>Temurin11</id>
     <version>11.0.21.900</version>
-    <title>Temurin jdk11 hotspot 11.0.21.9</title>
+    <title>Temurin jdk11 hotspot</title>
     <authors>Adoptium</authors>
     <owners>JohanJanssen</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <licenseUrl>https://github.com/adoptium/jdk11u/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://adoptium.net/</projectUrl>
-    <iconUrl>https://github.com/ajshastri/chocolatey-packages/blob/266841efd2047b3a49b5de199b5e7b465f591104/icons/temurin-light.png</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/temurin-light.png</iconUrl>
     <description>## Temurin
  
  The Temurin11 package uses OpenJDK_HotSpot VM from Temurin using the msi file format.
@@ -48,6 +48,6 @@ This will install both the 32 bit and 64 bit versions of the desired package by
 Example: `choco install Temurin11 --params="/both"`</description>
     <summary>Adoptium provides prebuilt OpenJDK build binaries. This one uses OpenJDK_HotSpot.</summary>
     <tags>openjdk java jvm</tags>
-    <packageSourceUrl>https://github.com/johanjanssen/TemurinChocolateyPackages</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/temurin-11-jre/temurin11jre.nuspec b/temurin-11-jre/temurin11jre.nuspec
index a83a448..281cc39 100644
--- a/temurin-11-jre/temurin11jre.nuspec
+++ b/temurin-11-jre/temurin11jre.nuspec
@@ -3,13 +3,13 @@
   <metadata>
     <id>Temurin11jre</id>
     <version>11.0.21.900</version>
-    <title>Temurin jre11 hotspot 11.0.21.9</title>
+    <title>Temurin jre11 hotspot</title>
     <authors>Adoptium</authors>
     <owners>JohanJanssen</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <licenseUrl>https://github.com/adoptium/jdk11u/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://adoptium.net/</projectUrl>
-    <iconUrl>https://github.com/ajshastri/chocolatey-packages/blob/266841efd2047b3a49b5de199b5e7b465f591104/icons/temurin-light.png</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/temurin-light.png</iconUrl>
     <description>## Temurin
  
  The Temurin11jre package uses OpenJDK_HotSpot VM from Temurin using the msi file format.
@@ -48,6 +48,6 @@ This will install both the 32 bit and 64 bit versions of the desired package by
 Example: `choco install Temurin11jre --params="/both"`</description>
     <summary>Adoptium provides prebuilt OpenJDK build binaries. This one uses OpenJDK_HotSpot.</summary>
     <tags>openjdk java jvm</tags>
-    <packageSourceUrl>https://github.com/johanjanssen/TemurinChocolateyPackages</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/temurin-17-jdk/temurin17.nuspec b/temurin-17-jdk/temurin17.nuspec
index cec9ddd..49bb103 100644
--- a/temurin-17-jdk/temurin17.nuspec
+++ b/temurin-17-jdk/temurin17.nuspec
@@ -3,13 +3,13 @@
   <metadata>
     <id>Temurin17</id>
     <version>17.0.9.900</version>
-    <title>Temurin jdk17 hotspot 17.0.9.9</title>
+    <title>Temurin jdk17 hotspot</title>
     <authors>Adoptium</authors>
     <owners>JohanJanssen</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <licenseUrl>https://github.com/adoptium/jdk17/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://adoptium.net/</projectUrl>
-    <iconUrl>https://github.com/ajshastri/chocolatey-packages/blob/266841efd2047b3a49b5de199b5e7b465f591104/icons/temurin-light.png</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/temurin-light.png</iconUrl>
     <description>## Temurin
  
  The Temurin17 package uses OpenJDK_HotSpot VM from Temurin using the msi file format.
@@ -48,6 +48,6 @@ This will install both the 32 bit and 64 bit versions of the desired package by
 Example: `choco install Temurin17 --params="/both"`</description>
     <summary>Adoptium provides prebuilt OpenJDK build binaries. This one uses OpenJDK_HotSpot.</summary>
     <tags>openjdk java jvm</tags>
-    <packageSourceUrl>https://github.com/johanjanssen/TemurinChocolateyPackages</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/temurin-17-jre/temurin17jre.nuspec b/temurin-17-jre/temurin17jre.nuspec
index 35cf999..ce4c1ba 100644
--- a/temurin-17-jre/temurin17jre.nuspec
+++ b/temurin-17-jre/temurin17jre.nuspec
@@ -3,13 +3,13 @@
   <metadata>
     <id>Temurin17jre</id>
     <version>17.0.9.900</version>
-    <title>Temurin jre17 hotspot 17.0.9.9</title>
+    <title>Temurin jre17 hotspot</title>
     <authors>Adoptium</authors>
     <owners>JohanJanssen</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <licenseUrl>https://github.com/adoptium/jdk17/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://adoptium.net/</projectUrl>
-    <iconUrl>https://github.com/ajshastri/chocolatey-packages/blob/266841efd2047b3a49b5de199b5e7b465f591104/icons/temurin-light.png</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/temurin-light.png</iconUrl>
     <description>## Temurin
  
  The Temurin17jre package uses OpenJDK_HotSpot VM from Temurin using the msi file format.
@@ -48,6 +48,6 @@ This will install both the 32 bit and 64 bit versions of the desired package by
 Example: `choco install Temurin17jre --params="/both"`</description>
     <summary>Adoptium provides prebuilt OpenJDK build binaries. This one uses OpenJDK_HotSpot.</summary>
     <tags>openjdk java jvm</tags>
-    <packageSourceUrl>https://github.com/johanjanssen/TemurinChocolateyPackages</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/temurin-21-jdk/temurin21.nuspec b/temurin-21-jdk/temurin21.nuspec
index dfce767..5b7104b 100644
--- a/temurin-21-jdk/temurin21.nuspec
+++ b/temurin-21-jdk/temurin21.nuspec
@@ -3,13 +3,13 @@
   <metadata>
     <id>Temurin21</id>
     <version>21.0.1.1200</version>
-    <title>Temurin jdk21 hotspot 21.0.1.12</title>
+    <title>Temurin jdk21 hotspot</title>
     <authors>Adoptium</authors>
     <owners>JohanJanssen</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <licenseUrl>https://github.com/adoptium/jdk21/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://adoptium.net/</projectUrl>
-    <iconUrl>https://github.com/ajshastri/chocolatey-packages/blob/266841efd2047b3a49b5de199b5e7b465f591104/icons/temurin-light.png</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/temurin-light.png</iconUrl>
     <description>## Temurin
  
  The Temurin21 package uses OpenJDK_HotSpot VM from Temurin using the msi file format.
@@ -48,6 +48,6 @@ This will install both the 32 bit and 64 bit versions of the desired package by
 Example: `choco install Temurin21 --params="/both"`</description>
     <summary>Adoptium provides prebuilt OpenJDK build binaries. This one uses OpenJDK_HotSpot.</summary>
     <tags>openjdk java jvm</tags>
-    <packageSourceUrl>https://github.com/johanjanssen/TemurinChocolateyPackages</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/temurin-21-jre/temurin21jre.nuspec b/temurin-21-jre/temurin21jre.nuspec
index 657e3af..6266a61 100644
--- a/temurin-21-jre/temurin21jre.nuspec
+++ b/temurin-21-jre/temurin21jre.nuspec
@@ -3,13 +3,13 @@
   <metadata>
     <id>Temurin21jre</id>
     <version>21.0.1.1200</version>
-    <title>Temurin jre21 hotspot 21.0.1.12</title>
+    <title>Temurin jre21 hotspot</title>
     <authors>Adoptium</authors>
     <owners>JohanJanssen</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <licenseUrl>https://github.com/adoptium/jdk21/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://adoptium.net/</projectUrl>
-    <iconUrl>https://github.com/ajshastri/chocolatey-packages/blob/266841efd2047b3a49b5de199b5e7b465f591104/icons/temurin-light.png</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/temurin-light.png</iconUrl>
     <description>## Temurin
  
  The Temurin21jre package uses OpenJDK_HotSpot VM from Temurin using the msi file format.
@@ -48,6 +48,6 @@ This will install both the 32 bit and 64 bit versions of the desired package by
 Example: `choco install Temurin21jre --params="/both"`</description>
     <summary>Adoptium provides prebuilt OpenJDK build binaries. This one uses OpenJDK_HotSpot.</summary>
     <tags>openjdk java jvm</tags>
-    <packageSourceUrl>https://github.com/johanjanssen/TemurinChocolateyPackages</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/temurin-8-jdk/temurin8.nuspec b/temurin-8-jdk/temurin8.nuspec
index 79254b5..1f5052e 100644
--- a/temurin-8-jdk/temurin8.nuspec
+++ b/temurin-8-jdk/temurin8.nuspec
@@ -3,13 +3,13 @@
   <metadata>
     <id>Temurin8</id>
     <version>8.392.8</version>
-    <title>Temurin jdk8 hotspot 8.392.8</title>
+    <title>Temurin jdk8 hotspot</title>
     <authors>Adoptium</authors>
     <owners>JohanJanssen</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <licenseUrl>https://github.com/adoptium/jdk8u/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://adoptium.net/</projectUrl>
-    <iconUrl>https://github.com/ajshastri/chocolatey-packages/blob/266841efd2047b3a49b5de199b5e7b465f591104/icons/temurin-light.png</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/temurin-light.png</iconUrl>
     <description>## Temurin
  
  The Temurin8 package uses OpenJDK_HotSpot VM from Temurin using the msi file format.
@@ -48,6 +48,6 @@ This will install both the 32 bit and 64 bit versions of the desired package by
 Example: `choco install Temurin8 --params="/both"`</description>
     <summary>Adoptium provides prebuilt OpenJDK build binaries. This one uses OpenJDK_HotSpot.</summary>
     <tags>openjdk java jvm</tags>
-    <packageSourceUrl>https://github.com/johanjanssen/TemurinChocolateyPackages</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/temurin-8-jre/temurin8jre.nuspec b/temurin-8-jre/temurin8jre.nuspec
index 208cbec..1b112be 100644
--- a/temurin-8-jre/temurin8jre.nuspec
+++ b/temurin-8-jre/temurin8jre.nuspec
@@ -3,13 +3,13 @@
   <metadata>
     <id>Temurin8jre</id>
     <version>8.392.8</version>
-    <title>Temurin jre8 hotspot 8.392.8</title>
+    <title>Temurin jre8 hotspot</title>
     <authors>Adoptium</authors>
     <owners>JohanJanssen</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <licenseUrl>https://github.com/adoptium/jdk8u/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://adoptium.net/</projectUrl>
-    <iconUrl>https://github.com/ajshastri/chocolatey-packages/blob/266841efd2047b3a49b5de199b5e7b465f591104/icons/temurin-light.png</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/temurin-light.png</iconUrl>
     <description>## Temurin
  
  The Temurin8jre package uses OpenJDK_HotSpot VM from Temurin using the msi file format.
@@ -48,6 +48,6 @@ This will install both the 32 bit and 64 bit versions of the desired package by
 Example: `choco install Temurin8jre --params="/both"`</description>
     <summary>Adoptium provides prebuilt OpenJDK build binaries. This one uses OpenJDK_HotSpot.</summary>
     <tags>openjdk java jvm</tags>
-    <packageSourceUrl>https://github.com/johanjanssen/TemurinChocolateyPackages</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/temurin-jdk/temurin.nuspec b/temurin-jdk/temurin.nuspec
index 8739aba..1d5f055 100644
--- a/temurin-jdk/temurin.nuspec
+++ b/temurin-jdk/temurin.nuspec
@@ -3,13 +3,13 @@
   <metadata>
     <id>Temurin</id>
     <version>21.0.1.1200</version>
-    <title>Temurin jdk21 hotspot 21.0.1.12</title>
+    <title>Temurin jdk21 hotspot</title>
     <authors>Adoptium</authors>
     <owners>JohanJanssen</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <licenseUrl>https://github.com/adoptium/jdk21/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://adoptium.net/</projectUrl>
-    <iconUrl>https://github.com/ajshastri/chocolatey-packages/blob/266841efd2047b3a49b5de199b5e7b465f591104/icons/temurin-light.png</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/temurin-light.png</iconUrl>
     <description>## Temurin
  
  The Temurin package uses OpenJDK_HotSpot VM from Temurin using the msi file format.
@@ -48,6 +48,6 @@ This will install both the 32 bit and 64 bit versions of the desired package by
 Example: `choco install Temurin --params="/both"`</description>
     <summary>Adoptium provides prebuilt OpenJDK build binaries. This one uses OpenJDK_HotSpot.</summary>
     <tags>openjdk java jvm</tags>
-    <packageSourceUrl>https://github.com/johanjanssen/TemurinChocolateyPackages</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/temurin-jre/temurinjre.nuspec b/temurin-jre/temurinjre.nuspec
index bb4ab9e..c7368af 100644
--- a/temurin-jre/temurinjre.nuspec
+++ b/temurin-jre/temurinjre.nuspec
@@ -3,13 +3,13 @@
   <metadata>
     <id>Temurinjre</id>
     <version>21.0.1.1200</version>
-    <title>Temurin jre21 hotspot 21.0.1.12</title>
+    <title>Temurin jre21 hotspot</title>
     <authors>Adoptium</authors>
     <owners>JohanJanssen</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <licenseUrl>https://github.com/adoptium/jdk21/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://adoptium.net/</projectUrl>
-    <iconUrl>https://github.com/ajshastri/chocolatey-packages/blob/266841efd2047b3a49b5de199b5e7b465f591104/icons/temurin-light.png</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/temurin-light.png</iconUrl>
     <description>## Temurin
  
  The Temurinjre package uses OpenJDK_HotSpot VM from Temurin using the msi file format.
@@ -48,6 +48,6 @@ This will install both the 32 bit and 64 bit versions of the desired package by
 Example: `choco install Temurinjre --params="/both"`</description>
     <summary>Adoptium provides prebuilt OpenJDK build binaries. This one uses OpenJDK_HotSpot.</summary>
     <tags>openjdk java jvm</tags>
-    <packageSourceUrl>https://github.com/johanjanssen/TemurinChocolateyPackages</packageSourceUrl>
+    <packageSourceUrl>https://github.com/ajshastri/chocolatey-packages</packageSourceUrl>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/zulu-11/zulu-11.nuspec b/zulu-11/zulu-11.nuspec
index 08c3667..8517cd0 100755
--- a/zulu-11/zulu-11.nuspec
+++ b/zulu-11/zulu-11.nuspec
@@ -9,7 +9,7 @@
     <title>Zulu 11</title>
     <authors>Azul Systems</authors>
     <projectUrl>https://www.azul.com/products/zulu-enterprise/</projectUrl>
-    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/fdc8f815b0a5cf2beb5322aa027800c545826f7c/icons/azul-logo.svg</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/azul-logo.png</iconUrl>
     <copyright>Azul 2023. All rights reserved.</copyright>
     <licenseUrl>https://www.azul.com/products/zulu-and-zulu-enterprise/zulu-terms-of-use/</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
diff --git a/zulu-17/zulu-17.nuspec b/zulu-17/zulu-17.nuspec
index ec3dec1..ab147ed 100755
--- a/zulu-17/zulu-17.nuspec
+++ b/zulu-17/zulu-17.nuspec
@@ -9,7 +9,7 @@
     <title>Zulu 17</title>
     <authors>Azul Systems</authors>
     <projectUrl>https://www.azul.com/products/zulu-enterprise/</projectUrl>
-    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/fdc8f815b0a5cf2beb5322aa027800c545826f7c/icons/azul-logo.svg</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/azul-logo.png</iconUrl>
     <copyright>Azul 2023. All rights reserved.</copyright>
     <licenseUrl>https://www.azul.com/products/zulu-and-zulu-enterprise/zulu-terms-of-use/</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
diff --git a/zulu-21/zulu-21.nuspec b/zulu-21/zulu-21.nuspec
index 12e043a..3a90d44 100755
--- a/zulu-21/zulu-21.nuspec
+++ b/zulu-21/zulu-21.nuspec
@@ -9,7 +9,7 @@
     <title>Zulu 21</title>
     <authors>Azul Systems</authors>
     <projectUrl>https://www.azul.com/products/zulu-enterprise/</projectUrl>
-    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/fdc8f815b0a5cf2beb5322aa027800c545826f7c/icons/azul-logo.svg</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/azul-logo.png</iconUrl>
     <copyright>Azul 2023. All rights reserved.</copyright>
     <licenseUrl>https://www.azul.com/products/zulu-and-zulu-enterprise/zulu-terms-of-use/</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
diff --git a/zulu-7/zulu-7.nuspec b/zulu-7/zulu-7.nuspec
index 7f4f88f..b365f73 100755
--- a/zulu-7/zulu-7.nuspec
+++ b/zulu-7/zulu-7.nuspec
@@ -9,7 +9,7 @@
     <title>Zulu 7</title>
     <authors>Azul Systems</authors>
     <projectUrl>https://www.azul.com/products/zulu-enterprise/</projectUrl>
-    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/fdc8f815b0a5cf2beb5322aa027800c545826f7c/icons/azul-logo.svg</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/azul-logo.png</iconUrl>
     <copyright>Azul 2023. All rights reserved.</copyright>
     <licenseUrl>https://www.azul.com/products/zulu-and-zulu-enterprise/zulu-terms-of-use/</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
diff --git a/zulu-8/zulu-8.nuspec b/zulu-8/zulu-8.nuspec
index a046671..fae6195 100755
--- a/zulu-8/zulu-8.nuspec
+++ b/zulu-8/zulu-8.nuspec
@@ -9,7 +9,7 @@
     <title>Zulu 8</title>
     <authors>Azul Systems</authors>
     <projectUrl>https://www.azul.com/products/zulu-enterprise/</projectUrl>
-    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/fdc8f815b0a5cf2beb5322aa027800c545826f7c/icons/azul-logo.svg</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/azul-logo.png</iconUrl>
     <copyright>Azul 2023. All rights reserved.</copyright>
     <licenseUrl>https://www.azul.com/products/zulu-and-zulu-enterprise/zulu-terms-of-use/</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
diff --git a/zulu/zulu.nuspec b/zulu/zulu.nuspec
index c54e0f0..ecb2d23 100755
--- a/zulu/zulu.nuspec
+++ b/zulu/zulu.nuspec
@@ -9,7 +9,7 @@
     <title>Zulu</title>
     <authors>Azul Systems</authors>
     <projectUrl>https://www.azul.com/products/zulu-enterprise/</projectUrl>
-    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/fdc8f815b0a5cf2beb5322aa027800c545826f7c/icons/azul-logo.svg</iconUrl>
+    <iconUrl>https://rawcdn.githack.com/ajshastri/chocolatey-packages/a698d21b3c63b9ff7e01f442f37cdb7ecf89925a/icons/azul-logo.png</iconUrl>
     <copyright>Azul 2023. All rights reserved.</copyright>
     <licenseUrl>https://www.azul.com/products/zulu-and-zulu-enterprise/zulu-terms-of-use/</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>