diff --git a/FunKey/package/FCEUX/FCEUX.mk b/FunKey/package/FCEUX/FCEUX.mk
index 8e8d7db..d60e300 100644
--- a/FunKey/package/FCEUX/FCEUX.mk
+++ b/FunKey/package/FCEUX/FCEUX.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FCEUX_VERSION = fceux-FunKey-1.2.1
+FCEUX_VERSION = 9086864
 FCEUX_SITE_METHOD = git
 FCEUX_SITE = https://github.com/FunKey-Project/fceux.git
 FCEUX_LICENSE = GPL-2.0
diff --git a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
index d84acce..a7fcd71 100644
--- a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
+++ b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PCSX_REARMED_VERSION = pcsx_rearmed-FunKey-1.2.1
+PCSX_REARMED_VERSION = a220829
 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 fd90c33..f8adb8d 100644
--- a/FunKey/package/PocketSNES/PocketSNES.mk
+++ b/FunKey/package/PocketSNES/PocketSNES.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-POCKETSNES_VERSION = PocketSNES-FunKey-1.2.1
+POCKETSNES_VERSION = ce1ea99
 POCKETSNES_SITE_METHOD = git
 POCKETSNES_SITE = https://github.com/FunKey-Project/PocketSNES.git
 POCKETSNES_LICENSE = GPL-2.0
diff --git a/FunKey/package/commander/commander.mk b/FunKey/package/commander/commander.mk
index bb24cd1..ccd1cb5 100644
--- a/FunKey/package/commander/commander.mk
+++ b/FunKey/package/commander/commander.mk
@@ -3,7 +3,7 @@
 # commander
 #
 #############################################################
-COMMANDER_VERSION = commander-FunKey-1.1.0
+COMMANDER_VERSION = e06aedd
 COMMANDER_SITE_METHOD = git
 COMMANDER_SITE = https://github.com/FunKey-Project/commander.git
 COMMANDER_LICENSE = GPL-2.0
diff --git a/FunKey/package/gnuboy/gnuboy.mk b/FunKey/package/gnuboy/gnuboy.mk
index adda50b..3fe5a02 100644
--- a/FunKey/package/gnuboy/gnuboy.mk
+++ b/FunKey/package/gnuboy/gnuboy.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GNUBOY_VERSION = gnuboy-FunKey-1.2.1
+GNUBOY_VERSION = 2339636
 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 40b6843..00fa828 100644
--- a/FunKey/package/gpsp/gpsp.mk
+++ b/FunKey/package/gpsp/gpsp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GPSP_VERSION = gpsp-FunKey-1.2.1
+GPSP_VERSION = 59f1f08
 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 8de4762..a7593e5 100644
--- a/FunKey/package/mednafen/mednafen.mk
+++ b/FunKey/package/mednafen/mednafen.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MEDNAFEN_VERSION = mednafen-git-FunKey-1.2.1
+MEDNAFEN_VERSION = e78db14
 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 a2a7e50..df11d35 100644
--- a/FunKey/package/picodrive/picodrive.mk
+++ b/FunKey/package/picodrive/picodrive.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PICODRIVE_VERSION = picodrive-FunKey-1.2.2
+PICODRIVE_VERSION = 93c8ee8
 PICODRIVE_SITE_METHOD = git
 PICODRIVE_SITE = https://github.com/FunKey-Project/picodrive.git
 PICODRIVE_LICENSE = MAME