diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 4959c29fd..72b1223de 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1,5 +1,5 @@
 //#define LULZBOT_Hibiscus_Mini2
-//#define LULZBOT_Oliveoil_TAZ6
+#define LULZBOT_Oliveoil_TAZ6
 //#define LULZBOT_Redgum_TAZWorkhorse
 //#define LULZBOT_Quiver_TAZPro
 //#define LULZBOT_Gladiator_TAZProXT
diff --git a/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin/src/pins/rambo/pins_RAMBO.h
index 1a6fd85a5..6551bb64a 100644
--- a/Marlin/src/pins/rambo/pins_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_RAMBO.h
@@ -90,9 +90,9 @@
 #define X_DIR_PIN                             48
 #define X_ENABLE_PIN                          29
 
-#define Y_STEP_PIN                            36
-#define Y_DIR_PIN                             49
-#define Y_ENABLE_PIN                          28
+#define Y_STEP_PIN                            33
+#define Y_DIR_PIN                             42
+#define Y_ENABLE_PIN                          25
 
 #define Z_STEP_PIN                            35
 #define Z_DIR_PIN                             47
@@ -102,24 +102,24 @@
 #define E0_DIR_PIN                            43
 #define E0_ENABLE_PIN                         26
 
-#define E1_STEP_PIN                           33
-#define E1_DIR_PIN                            42
-#define E1_ENABLE_PIN                         25
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            49
+#define E1_ENABLE_PIN                         28
 
 // Microstepping pins - Mapping not from fastio.h (?)
 #define X_MS1_PIN                             40
 #define X_MS2_PIN                             41
-#define Y_MS1_PIN                             69
-#define Y_MS2_PIN                             39
+#define Y_MS1_PIN                             63
+#define Y_MS2_PIN                             64
 #define Z_MS1_PIN                             68
 #define Z_MS2_PIN                             67
 #define E0_MS1_PIN                            65
 #define E0_MS2_PIN                            66
-#define E1_MS1_PIN                            63
-#define E1_MS2_PIN                            64
+#define E1_MS1_PIN                            69
+#define E1_MS2_PIN                            39
 
 #define DIGIPOTSS_PIN                         38
-#define DIGIPOT_CHANNELS { 4, 5, 3, 0, 1 }        // X Y Z E0 E1 digipot channels to stepper driver mapping
+#define DIGIPOT_CHANNELS { 4, 1, 3, 0, 5 }        // X Y Z E0 E1 digipot channels to stepper driver mapping
 #ifndef DIGIPOT_MOTOR_CURRENT
   #define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 }   // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
 #endif