diff --git a/keyboards/fingerpunch/ffkb/rp/rp.h b/keyboards/fingerpunch/ffkb/rp/rp.h
index c67d34f5c2..16404cb003 100644
--- a/keyboards/fingerpunch/ffkb/rp/rp.h
+++ b/keyboards/fingerpunch/ffkb/rp/rp.h
@@ -17,10 +17,10 @@
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_fingerpunch_ffkb_rp_v3)
-#    include "v3.h"
-#elif defined(KEYBOARD_fingerpunch_ffkb_rp_v4)
+#if defined(KEYBOARD_fingerpunch_ffkb_rp_v4)
 #    include "v4.h"
+#elif defined(KEYBOARD_fingerpunch_ffkb_rp_v5)
+#    include "v5.h"
 #endif
 
 #include "keyboards/fingerpunch/src/fp.h"
diff --git a/keyboards/fingerpunch/ffkb/rp/v3/config.h b/keyboards/fingerpunch/ffkb/rp/v4/config.h
similarity index 100%
rename from keyboards/fingerpunch/ffkb/rp/v3/config.h
rename to keyboards/fingerpunch/ffkb/rp/v4/config.h
diff --git a/keyboards/fingerpunch/ffkb/rp/v3/fp_build.json b/keyboards/fingerpunch/ffkb/rp/v4/fp_build.json
similarity index 100%
rename from keyboards/fingerpunch/ffkb/rp/v3/fp_build.json
rename to keyboards/fingerpunch/ffkb/rp/v4/fp_build.json
diff --git a/keyboards/fingerpunch/ffkb/rp/v3/halconf.h b/keyboards/fingerpunch/ffkb/rp/v4/halconf.h
similarity index 100%
rename from keyboards/fingerpunch/ffkb/rp/v3/halconf.h
rename to keyboards/fingerpunch/ffkb/rp/v4/halconf.h
diff --git a/keyboards/fingerpunch/ffkb/rp/v3/info.json b/keyboards/fingerpunch/ffkb/rp/v4/info.json
similarity index 75%
rename from keyboards/fingerpunch/ffkb/rp/v3/info.json
rename to keyboards/fingerpunch/ffkb/rp/v4/info.json
index 9deb49d452..7c19777d28 100644
--- a/keyboards/fingerpunch/ffkb/rp/v3/info.json
+++ b/keyboards/fingerpunch/ffkb/rp/v4/info.json
@@ -1,7 +1,7 @@
 {
     "manufacturer": "sadekbaroudi",
     "keyboard_name": "ffkb",
-    "url": "https://fingerpunch.xyz/product/faux-fox-keyboard-rp2040-v3/",
+    "url": "https://fingerpunch.xyz/product/faux-fox-keyboard-v4/",
     "maintainer": "Sadek Baroudi <sadekbaroudi@gmail.com>",
     "usb": {
         "vid": "0xFE2B",
diff --git a/keyboards/fingerpunch/ffkb/rp/v3/keymaps/default/config.h b/keyboards/fingerpunch/ffkb/rp/v4/keymaps/default/config.h
similarity index 100%
rename from keyboards/fingerpunch/ffkb/rp/v3/keymaps/default/config.h
rename to keyboards/fingerpunch/ffkb/rp/v4/keymaps/default/config.h
diff --git a/keyboards/fingerpunch/ffkb/rp/v3/keymaps/default/keymap.c b/keyboards/fingerpunch/ffkb/rp/v4/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/fingerpunch/ffkb/rp/v3/keymaps/default/keymap.c
rename to keyboards/fingerpunch/ffkb/rp/v4/keymaps/default/keymap.c
diff --git a/keyboards/fingerpunch/ffkb/rp/v3/keymaps/manna-harbour_miryoku/config.h b/keyboards/fingerpunch/ffkb/rp/v4/keymaps/manna-harbour_miryoku/config.h
similarity index 100%
rename from keyboards/fingerpunch/ffkb/rp/v3/keymaps/manna-harbour_miryoku/config.h
rename to keyboards/fingerpunch/ffkb/rp/v4/keymaps/manna-harbour_miryoku/config.h
diff --git a/keyboards/fingerpunch/ffkb/rp/v3/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/fingerpunch/ffkb/rp/v4/keymaps/manna-harbour_miryoku/keymap.c
similarity index 100%
rename from keyboards/fingerpunch/ffkb/rp/v3/keymaps/manna-harbour_miryoku/keymap.c
rename to keyboards/fingerpunch/ffkb/rp/v4/keymaps/manna-harbour_miryoku/keymap.c
diff --git a/keyboards/fingerpunch/ffkb/rp/v3/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/ffkb/rp/v4/keymaps/sadekbaroudi/keymap.c
similarity index 100%
rename from keyboards/fingerpunch/ffkb/rp/v3/keymaps/sadekbaroudi/keymap.c
rename to keyboards/fingerpunch/ffkb/rp/v4/keymaps/sadekbaroudi/keymap.c
diff --git a/keyboards/fingerpunch/ffkb/rp/v3/keymaps/via/keymap.c b/keyboards/fingerpunch/ffkb/rp/v4/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/fingerpunch/ffkb/rp/v3/keymaps/via/keymap.c
rename to keyboards/fingerpunch/ffkb/rp/v4/keymaps/via/keymap.c
diff --git a/keyboards/fingerpunch/ffkb/rp/v3/keymaps/via/rules.mk b/keyboards/fingerpunch/ffkb/rp/v4/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/fingerpunch/ffkb/rp/v3/keymaps/via/rules.mk
rename to keyboards/fingerpunch/ffkb/rp/v4/keymaps/via/rules.mk
diff --git a/keyboards/fingerpunch/ffkb/rp/v3/kle-via.json b/keyboards/fingerpunch/ffkb/rp/v4/kle-via.json
similarity index 100%
rename from keyboards/fingerpunch/ffkb/rp/v3/kle-via.json
rename to keyboards/fingerpunch/ffkb/rp/v4/kle-via.json
diff --git a/keyboards/fingerpunch/ffkb/rp/v3/mcuconf.h b/keyboards/fingerpunch/ffkb/rp/v4/mcuconf.h
similarity index 100%
rename from keyboards/fingerpunch/ffkb/rp/v3/mcuconf.h
rename to keyboards/fingerpunch/ffkb/rp/v4/mcuconf.h
diff --git a/keyboards/fingerpunch/ffkb/rp/v3/readme.md b/keyboards/fingerpunch/ffkb/rp/v4/readme.md
similarity index 91%
rename from keyboards/fingerpunch/ffkb/rp/v3/readme.md
rename to keyboards/fingerpunch/ffkb/rp/v4/readme.md
index 585b012e8f..614946ad1d 100644
--- a/keyboards/fingerpunch/ffkb/rp/v3/readme.md
+++ b/keyboards/fingerpunch/ffkb/rp/v4/readme.md
@@ -8,7 +8,7 @@ Faux fox keyboard (ffkb)
 
 Make example for this keyboard (after setting up your build environment):
 ```
-    make fingerpunch/ffkb/rp/v3:default RGBLIGHT_ENABLE=yes FP_EC11=yes CIRQUE_ENABLE=yes
+    make fingerpunch/ffkb/rp/v4:default RGBLIGHT_ENABLE=yes FP_EC11=yes CIRQUE_ENABLE=yes
 ```
 
 Options are:
diff --git a/keyboards/fingerpunch/ffkb/rp/v3/rules.mk b/keyboards/fingerpunch/ffkb/rp/v4/rules.mk
similarity index 100%
rename from keyboards/fingerpunch/ffkb/rp/v3/rules.mk
rename to keyboards/fingerpunch/ffkb/rp/v4/rules.mk
diff --git a/keyboards/fingerpunch/ffkb/rp/v3/v3.c b/keyboards/fingerpunch/ffkb/rp/v4/v4.c
similarity index 99%
rename from keyboards/fingerpunch/ffkb/rp/v3/v3.c
rename to keyboards/fingerpunch/ffkb/rp/v4/v4.c
index b1fa41556f..3bfb2b85c0 100644
--- a/keyboards/fingerpunch/ffkb/rp/v3/v3.c
+++ b/keyboards/fingerpunch/ffkb/rp/v4/v4.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "v3.h"
+#include "v4.h"
 
 #ifdef RGB_MATRIX_ENABLE
 // 6 column rgb config
diff --git a/keyboards/fingerpunch/ffkb/rp/v3/v3.h b/keyboards/fingerpunch/ffkb/rp/v4/v4.h
similarity index 100%
rename from keyboards/fingerpunch/ffkb/rp/v3/v3.h
rename to keyboards/fingerpunch/ffkb/rp/v4/v4.h
diff --git a/users/sadekbaroudi/process_records.h b/users/sadekbaroudi/process_records.h
index 90dfbad630..bb0d39a132 100755
--- a/users/sadekbaroudi/process_records.h
+++ b/users/sadekbaroudi/process_records.h
@@ -13,7 +13,7 @@
     || defined(KEYBOARD_fingerpunch_ffkb_byomcu_v2) \
     || defined(KEYBOARD_fingerpunch_ffkb_byomcu_v3) \
     || defined(KEYBOARD_fingerpunch_ffkb_lite_v1) \
-    || defined(KEYBOARD_fingerpunch_ffkb_rp2040_v3) \
+    || defined(KEYBOARD_fingerpunch_ffkb_rp_v4) \
     || defined(KEYBOARD_fingerpunch_fflx) \
     || defined(KEYBOARD_fingerpunch_fpm101) \
     || defined(KEYBOARD_fingerpunch_luakeeb) \