diff --git a/FunKey/board/funkey/rootfs-overlay/etc/issue b/FunKey/board/funkey/rootfs-overlay/etc/issue
index d8e1e20..433c066 100644
--- a/FunKey/board/funkey/rootfs-overlay/etc/issue
+++ b/FunKey/board/funkey/rootfs-overlay/etc/issue
@@ -5,6 +5,6 @@
 |___|    |_____|__|__||__|\__||_____|___  |
          FUN ON A KEYCHAIN          |_____|
  -----------------------------------------------------
- Version 2.2.0
+ Version 2.2.1
  -----------------------------------------------------
 
diff --git a/FunKey/board/funkey/rootfs-overlay/etc/os-release b/FunKey/board/funkey/rootfs-overlay/etc/os-release
index 946739f..446b194 100644
--- a/FunKey/board/funkey/rootfs-overlay/etc/os-release
+++ b/FunKey/board/funkey/rootfs-overlay/etc/os-release
@@ -1,12 +1,12 @@
 NAME="FunKey-OS"
-VERSION="2.2.0 (Pyromaniac Penguin)"
+VERSION="2.2.1 (Zen Zebu)"
 ID=funkey
 ID_LIKE=buildroot
-PRETTY_NAME="FunKey-OS 2.2.0"
-VERSION_ID="2.2.0"
+PRETTY_NAME="FunKey-OS 2.2.1"
+VERSION_ID="2.2.1"
 HOME_URL="https://www.funkey-project.com/"
 SUPPORT_URL="https://www.funkey-project.com/"
 BUG_REPORT_URL="https://www.funkey-project.com/"
 PRIVACY_POLICY_URL="https://www.funkey-project.com"
-VERSION_CODENAME=Pyromaniac
-UBUNTU_CODENAME=Pyromaniac
+VERSION_CODENAME=Zen
+UBUNTU_CODENAME=Zen
diff --git a/FunKey/board/funkey/rootfs-overlay/etc/sw-versions b/FunKey/board/funkey/rootfs-overlay/etc/sw-versions
index 0730586..b8e2cdb 100644
--- a/FunKey/board/funkey/rootfs-overlay/etc/sw-versions
+++ b/FunKey/board/funkey/rootfs-overlay/etc/sw-versions
@@ -1 +1 @@
-rootfs	2.2.0
+rootfs	2.2.1
diff --git a/FunKey/package/FCEUX/FCEUX.mk b/FunKey/package/FCEUX/FCEUX.mk
index a172dc0..268568a 100644
--- a/FunKey/package/FCEUX/FCEUX.mk
+++ b/FunKey/package/FCEUX/FCEUX.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FCEUX_VERSION = 336090c
+FCEUX_VERSION = fceux-FunKey-1.2.2
 FCEUX_SITE_METHOD = git
 FCEUX_SITE = https://github.com/FunKey-Project/fceux.git
 FCEUX_LICENSE = GPL-2.0
diff --git a/FunKey/package/commander/commander.mk b/FunKey/package/commander/commander.mk
index 6f4aa10..035d449 100644
--- a/FunKey/package/commander/commander.mk
+++ b/FunKey/package/commander/commander.mk
@@ -3,7 +3,7 @@
 # commander
 #
 #############################################################
-COMMANDER_VERSION = 9ba64f0
+COMMANDER_VERSION = commander-FunKey-1.1.1
 COMMANDER_SITE_METHOD = git
 COMMANDER_SITE = https://github.com/FunKey-Project/commander.git
 COMMANDER_LICENSE = GPL-2.0
diff --git a/FunKey/package/fkgpiod/fkgpiod.mk b/FunKey/package/fkgpiod/fkgpiod.mk
index cb6b85f..b7ad3a6 100644
--- a/FunKey/package/fkgpiod/fkgpiod.mk
+++ b/FunKey/package/fkgpiod/fkgpiod.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FKGPIOD_VERSION = 4df43ea
+FKGPIOD_VERSION = fkgpiod-FunKey-1.0.1
 FKGPIOD_SITE_METHOD = git
 FKGPIOD_SITE = https://github.com/FunKey-Project/fkgpiod.git
 FKGPIOD_SITE_LICENSE = GPL-2.1+
diff --git a/FunKey/package/gnuboy/gnuboy.mk b/FunKey/package/gnuboy/gnuboy.mk
index 1ddd37f..a261d7f 100644
--- a/FunKey/package/gnuboy/gnuboy.mk
+++ b/FunKey/package/gnuboy/gnuboy.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GNUBOY_VERSION = dcd6186
+GNUBOY_VERSION = gnuboy-FunKey-1.2.2
 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 c69ee50..004fa32 100644
--- a/FunKey/package/gpsp/gpsp.mk
+++ b/FunKey/package/gpsp/gpsp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GPSP_VERSION = 80bf9c6
+GPSP_VERSION = gpsp-FunKey-1.2.2
 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 68c22d1..56cd0ba 100644
--- a/FunKey/package/mednafen/mednafen.mk
+++ b/FunKey/package/mednafen/mednafen.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MEDNAFEN_VERSION = cbcdbd8
+MEDNAFEN_VERSION = mednafen-git-FunKey-1.2.2
 MEDNAFEN_SITE_METHOD = git
 MEDNAFEN_SITE = https://github.com/FunKey-Project/mednafen-git.git
 MEDNAFEN_LICENSE = GPL-2.0+
diff --git a/Recovery/board/funkey/rootfs-overlay/etc/issue b/Recovery/board/funkey/rootfs-overlay/etc/issue
index d2e81a5..588ec58 100644
--- a/Recovery/board/funkey/rootfs-overlay/etc/issue
+++ b/Recovery/board/funkey/rootfs-overlay/etc/issue
@@ -5,6 +5,6 @@
 |___|    |_____|__|__||__|\__||_____|___  |
          FUN ON A KEYCHAIN          |_____|
  -----------------------------------------------------
- Version 2.1.0 (Recovery)
+ Version 2.1.1 (Recovery)
  -----------------------------------------------------
 
diff --git a/Recovery/board/funkey/rootfs-overlay/etc/os-release b/Recovery/board/funkey/rootfs-overlay/etc/os-release
index b8841f8..b2a962b 100644
--- a/Recovery/board/funkey/rootfs-overlay/etc/os-release
+++ b/Recovery/board/funkey/rootfs-overlay/etc/os-release
@@ -1,12 +1,12 @@
 NAME="FunKey-OS Recovery"
-VERSION="2.1.0 (Hoopy Hawk)"
+VERSION="2.1.1 (Vitriolic Vulture)"
 ID=funkey-recovery
 ID_LIKE=buildroot
-PRETTY_NAME="FunKey-OS Recovery 2.1.0"
-VERSION_ID="2.1.0"
+PRETTY_NAME="FunKey-OS Recovery 2.1.1"
+VERSION_ID="2.1.1"
 HOME_URL="https://www.funkey-project.com/"
 SUPPORT_URL="https://www.funkey-project.com/"
 BUG_REPORT_URL="https://www.funkey-project.com/"
 PRIVACY_POLICY_URL="https://www.funkey-project.com"
-VERSION_CODENAME=Hoopy
-UBUNTU_CODENAME=Hoopy
+VERSION_CODENAME=Vitriolic
+UBUNTU_CODENAME=Vitriolic
diff --git a/Recovery/board/funkey/rootfs-overlay/etc/sw-versions b/Recovery/board/funkey/rootfs-overlay/etc/sw-versions
index 175a929..c02866f 100644
--- a/Recovery/board/funkey/rootfs-overlay/etc/sw-versions
+++ b/Recovery/board/funkey/rootfs-overlay/etc/sw-versions
@@ -1 +1 @@
-Recovery	2.1.0
+Recovery	2.1.1