diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/makefile.mk b/keyboard/ergodox_ez/keymaps/erez_experimental/Makefile
similarity index 80%
rename from keyboard/ergodox_ez/keymaps/erez_experimental/makefile.mk
rename to keyboard/ergodox_ez/keymaps/erez_experimental/Makefile
index faca18b54..b673c5ce5 100644
--- a/keyboard/ergodox_ez/keymaps/erez_experimental/makefile.mk
+++ b/keyboard/ergodox_ez/keymaps/erez_experimental/Makefile
@@ -3,3 +3,7 @@
 
 SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
 COMMAND_ENABLE   = no  # Commands for debug and configuration
+
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/config_user.h b/keyboard/ergodox_ez/keymaps/erez_experimental/config.h
similarity index 59%
rename from keyboard/ergodox_ez/keymaps/erez_experimental/config_user.h
rename to keyboard/ergodox_ez/keymaps/erez_experimental/config.h
index d19c2783c..314c2ec32 100644
--- a/keyboard/ergodox_ez/keymaps/erez_experimental/config_user.h
+++ b/keyboard/ergodox_ez/keymaps/erez_experimental/config.h
@@ -1,8 +1,9 @@
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#include "config.h"
+#include "../../config.h"
+
 #define ONESHOT_TAP_TOGGLE 2
-#define ONESHOT_TIMEOUT 3000
+#define ONESHOT_TIMEOUT 300
 
 #endif