diff --git a/FunKey/package/FCEUX/FCEUX.mk b/FunKey/package/FCEUX/FCEUX.mk
index 414fa1b..2f0b3bb 100644
--- a/FunKey/package/FCEUX/FCEUX.mk
+++ b/FunKey/package/FCEUX/FCEUX.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FCEUX_VERSION = 23fe9d5d47bd4fc9c9638030cd713942dca22d2d
+FCEUX_VERSION = fceux-FunKey-0.99
 FCEUX_SITE_METHOD = git
 FCEUX_SITE = https://github.com/FunKey-Project/fceux.git
 FCEUX_LICENSE = GPL-2.0
diff --git a/FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk b/FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk
index f2ccd07..62e57e1 100644
--- a/FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk
+++ b/FunKey/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-FUNKEY_GPIO_MAPPING_VERSION = cd412528079a59eab66e7d426e28d9966c2d731c
+FUNKEY_GPIO_MAPPING_VERSION = FunKey-GPIO-Mapping-FunKey-0.99
 FUNKEY_GPIO_MAPPING_SITE_METHOD = git
-FUNKEY_GPIO_MAPPING_SITE = ssh://git@github.com/FunKey-Project/FunKey-GPIO-Mapping.git
+FUNKEY_GPIO_MAPPING_SITE = https://github.com/FunKey-Project/FunKey-GPIO-Mapping.git
 FUNKEY_GPIO_MAPPING_SITE_LICENSE = GPL-2.1+
 FUNKEY_GPIO_MAPPING_SITE_LICENSE_FILES = COPYING
 
diff --git a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
index c2a453f..d68d7a3 100644
--- a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
+++ b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PCSX_REARMED_VERSION = bbaf67447bbcc8b169a0f092492f97c27923c3b7
+PCSX_REARMED_VERSION = pcsx_rearmed-FunKey-0.99
 PCSX_REARMED_SITE_METHOD = git
 PCSX_REARMED_SITE = https://github.com/FunKey-Project/pcsx_rearmed.git
 PCSX_REARMED_LICENSE = GPL-2.0
diff --git a/FunKey/package/PocketSNES/PocketSNES.mk b/FunKey/package/PocketSNES/PocketSNES.mk
index 2c91278..ee45f2d 100644
--- a/FunKey/package/PocketSNES/PocketSNES.mk
+++ b/FunKey/package/PocketSNES/PocketSNES.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-POCKETSNES_VERSION = 4c48411d3b71976a46696441c43ae86028962d58
+POCKETSNES_VERSION = PocketSNES-FunKey-0.99
 POCKETSNES_SITE_METHOD = git
 POCKETSNES_SITE = https://github.com/FunKey-Project/PocketSNES.git
 POCKETSNES_LICENSE = GPL-2.0
diff --git a/FunKey/package/ProdScreens/ProdScreens.mk b/FunKey/package/ProdScreens/ProdScreens.mk
index 8d9148e..77d9895 100644
--- a/FunKey/package/ProdScreens/ProdScreens.mk
+++ b/FunKey/package/ProdScreens/ProdScreens.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PRODSCREENS_VERSION = 6040b6aee8b5e277ca5ac37c7693376296710bbc
+PRODSCREENS_VERSION = FunKey-ProdScreens-FunKey-0.99
 PRODSCREENS_SITE_METHOD = git
 PRODSCREENS_SITE = https://github.com/FunKey-Project/FunKey-ProdScreens.git
 PRODSCREENS_SITE_LICENSE = GPL-2.1+
diff --git a/FunKey/package/gnuboy/gnuboy.mk b/FunKey/package/gnuboy/gnuboy.mk
index c8feba8..57c3b8c 100644
--- a/FunKey/package/gnuboy/gnuboy.mk
+++ b/FunKey/package/gnuboy/gnuboy.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GNUBOY_VERSION = 3edf32baa09882c4aa52f3e052e3d071c7044860
+GNUBOY_VERSION = gnuboy-FunKey-0.99
 GNUBOY_SITE_METHOD = git
 GNUBOY_SITE = https://github.com/FunKey-Project/gnuboy.git
 GNUBOY_LICENSE = GPL-2.0
diff --git a/FunKey/package/gpsp/gpsp.mk b/FunKey/package/gpsp/gpsp.mk
index 5665380..2ab2476 100644
--- a/FunKey/package/gpsp/gpsp.mk
+++ b/FunKey/package/gpsp/gpsp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GPSP_VERSION = 1cf3af9f2b041b861d4d2a5344ef27897bf60878
+GPSP_VERSION = gpsp-FunKey-0.99
 GPSP_SITE_METHOD = git
 GPSP_SITE = https://github.com/FunKey-Project/gpsp.git
 GPSP_LICENSE = GPL-2.0
diff --git a/FunKey/package/mednafen/mednafen.mk b/FunKey/package/mednafen/mednafen.mk
index b1307fb..25dd9d9 100644
--- a/FunKey/package/mednafen/mednafen.mk
+++ b/FunKey/package/mednafen/mednafen.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MEDNAFEN_VERSION = d60fb0da3e9fd1afb8ed43c4ef8cae6b3678d1a4
+MEDNAFEN_VERSION = mednafen-git-FunKey-0.99
 MEDNAFEN_SITE_METHOD = git
 MEDNAFEN_SITE = https://github.com/FunKey-Project/mednafen-git.git
 MEDNAFEN_LICENSE = GPL-2.0+
diff --git a/FunKey/package/picodrive/picodrive.mk b/FunKey/package/picodrive/picodrive.mk
index 610c447..1e9f26d 100644
--- a/FunKey/package/picodrive/picodrive.mk
+++ b/FunKey/package/picodrive/picodrive.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PICODRIVE_VERSION = 6bc02d3ba011b718d5dcf6b9215ce2b671ab4f7d
+PICODRIVE_VERSION = picodrive-FunKey-0.99
 PICODRIVE_SITE_METHOD = git
 PICODRIVE_SITE = https://github.com/FunKey-Project/picodrive.git
 PICODRIVE_LICENSE = MAME
diff --git a/FunKey/package/retrofe/retrofe.mk b/FunKey/package/retrofe/retrofe.mk
index 25feb37..a94443b 100644
--- a/FunKey/package/retrofe/retrofe.mk
+++ b/FunKey/package/retrofe/retrofe.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RETROFE_VERSION = bda5f1bda8931659fe5f6d0a95b9858312b89da7
+RETROFE_VERSION = RetroFE-FunKey-0.99
 RETROFE_SITE_METHOD = git
 RETROFE_SITE = https://github.com/FunKey-Project/RetroFE.git
 RETROFE_DEPENDENCIES = gstreamer1 gst1-plugins-base sdl sdl_image sdl_mixer sdl_sound sdl_ttf libglib2 sqlite zlib
diff --git a/Recovery/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk b/Recovery/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk
index 9d62057..62e57e1 100644
--- a/Recovery/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk
+++ b/Recovery/package/FunKey-GPIO-Mapping/FunKey-GPIO-Mapping.mk
@@ -4,10 +4,9 @@
 #
 ################################################################################
 
-FUNKEY_GPIO_MAPPING_VERSION = cd412528079a59eab66e7d426e28d9966c2d731c
+FUNKEY_GPIO_MAPPING_VERSION = FunKey-GPIO-Mapping-FunKey-0.99
 FUNKEY_GPIO_MAPPING_SITE_METHOD = git
-#FUNKEY_GPIO_MAPPING_SITE = ssh://git@github.com/FunKey-Project/FunKey-GPIO-Mapping.git
-FUNKEY_GPIO_MAPPING_SITE = ssh://git@fk/FunKey-Project/FunKey-GPIO-Mapping.git
+FUNKEY_GPIO_MAPPING_SITE = https://github.com/FunKey-Project/FunKey-GPIO-Mapping.git
 FUNKEY_GPIO_MAPPING_SITE_LICENSE = GPL-2.1+
 FUNKEY_GPIO_MAPPING_SITE_LICENSE_FILES = COPYING