diff --git a/app/boards/shields/waterfowl/waterfowl.dtsi b/app/boards/shields/waterfowl/waterfowl.dtsi
index c21dcf07d92..3d7e2f38ced 100644
--- a/app/boards/shields/waterfowl/waterfowl.dtsi
+++ b/app/boards/shields/waterfowl/waterfowl.dtsi
@@ -43,25 +43,50 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4)									RC(3,5) RC(3,6) RC(3,7) RC(3,8)
 		
 	};
 
-	left_encoder: encoder_left {    //roller
+	roller_left_encoder: encoder_left_roller {
 		compatible = "alps,ec11";
-		label = "LEFT_ENCODER";
-		a-gpios = <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		b-gpios = <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		label = "ROLLER_LEFT_ENCODER";
+		a-gpios = <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		b-gpios = <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
 		resolution = <4>;
+		status = "disabled";
 	};
 
-	right_encoder: encoder_right {  //Standard encoder on left half
+	dial_left_encoder: encoder_left_dial {
 		compatible = "alps,ec11";
-		label = "RIGHT_ENCODER";
+		label = "DIAL_LEFT_ENCODER";
 		a-gpios = <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
 		b-gpios = <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
-		resolution = <2>;
+		resolution = <4>;
+		status = "disabled";
+	};
+
+	roller_right_encoder: encoder_right_roller {
+		compatible = "alps,ec11";
+		label = "ROLLER_RIGHT_ENCODER";
+		a-gpios = <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		b-gpios = <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		resolution = <4>;
+		status = "disabled";
+	};
+
+	dial_right_encoder: encoder_right_dial {
+		compatible = "alps,ec11";
+		label = "DIAL_RIGHT_ENCODER";
+		a-gpios = <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		b-gpios = <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		resolution = <4>;
+		status = "disabled";
 	};
 
 	sensors {
 		compatible = "zmk,keymap-sensors";
-		sensors = <&left_encoder &right_encoder>;
+		sensors = <
+			&roller_left_encoder
+			&dial_left_encoder
+			&dial_right_encoder
+			&roller_right_encoder
+		>;
 	};
 
 	// TODO: RGB node(s)
diff --git a/app/boards/shields/waterfowl/waterfowl.keymap b/app/boards/shields/waterfowl/waterfowl.keymap
index 9a1dabacdbc..a6b1fd135d7 100644
--- a/app/boards/shields/waterfowl/waterfowl.keymap
+++ b/app/boards/shields/waterfowl/waterfowl.keymap
@@ -33,7 +33,12 @@
 	&kp N1		&lt 3 DEL	&lt 1 SPACE	&kp TAB		&kp N2			&kp N3	&kp ESC		&kp BSPC	&lt 2 RET	&kp N4
 			>;
 
-			sensor-bindings = <&inc_dec_kp PAGE_UP PAGE_DOWN &inc_dec_kp TAB LS(TAB)>;
+			sensor-bindings = <
+				&inc_dec_kp PAGE_DOWN PAGE_UP
+				&inc_dec_kp C_VOL_DN C_VOL_UP
+				&inc_dec_kp DOWN UP
+				&inc_dec_kp LEFT RIGHT
+			>;
 		};
 
 		navnum_layer {
@@ -57,7 +62,12 @@
 	&kp N1		&lt 3 DEL	&lt 1 SPACE	&kp TAB		&kp N2					&kp N3		&kp ESC	&kp BSPC	&lt 2 RET	&kp N4
 			>;
 
-			sensor-bindings = <&inc_dec_kp PAGE_UP PAGE_DOWN &inc_dec_kp TAB LS(TAB)>;
+			sensor-bindings = <
+				&inc_dec_kp PAGE_DOWN PAGE_UP
+				&inc_dec_kp C_VOL_DN C_VOL_UP
+				&inc_dec_kp DOWN UP
+				&inc_dec_kp LEFT RIGHT
+			>;
 		};
 
 		symbol_layer {
@@ -81,7 +91,12 @@
 	&kp N1			&lt 3 DEL	&lt 1 SPACE	&kp TAB		&kp N2					&kp N3			&kp ESC			&kp BSPC			&lt 2 RET	&kp N4
 			>;
 
-			sensor-bindings = <&inc_dec_kp PAGE_UP PAGE_DOWN &inc_dec_kp TAB LS(TAB)>;
+			sensor-bindings = <
+				&inc_dec_kp PAGE_DOWN PAGE_UP
+				&inc_dec_kp C_VOL_DN C_VOL_UP
+				&inc_dec_kp DOWN UP
+				&inc_dec_kp LEFT RIGHT
+			>;
 		};
 
 		function_layer {
@@ -105,8 +120,13 @@
 	&kp N1			&lt 3 DEL		&lt 1 SPACE		&kp TAB			&kp N2				&kp N3	&kp ESC	&kp BSPC	&lt 2 RET	&kp N4
 			>;
 
-			sensor-bindings = <&inc_dec_kp PAGE_UP PAGE_DOWN &inc_dec_kp TAB LS(TAB)>;
+			sensor-bindings = <
+				&inc_dec_kp PAGE_DOWN PAGE_UP
+				&inc_dec_kp C_VOL_DN C_VOL_UP
+				&inc_dec_kp DOWN UP
+				&inc_dec_kp LEFT RIGHT
+			>;
 		};	
 
 	};
-};
\ No newline at end of file
+};
diff --git a/app/boards/shields/waterfowl/waterfowl_left.overlay b/app/boards/shields/waterfowl/waterfowl_left.overlay
index 031936eaae5..b577e3ab53a 100644
--- a/app/boards/shields/waterfowl/waterfowl_left.overlay
+++ b/app/boards/shields/waterfowl/waterfowl_left.overlay
@@ -16,6 +16,10 @@
 		;
 };
 
-&left_encoder {
+&roller_left_encoder {
+	status = "okay";
+};
+
+&dial_left_encoder {
 	status = "okay";
 };
diff --git a/app/boards/shields/waterfowl/waterfowl_right.overlay b/app/boards/shields/waterfowl/waterfowl_right.overlay
index cff0d53cc5f..42e1c09e0de 100644
--- a/app/boards/shields/waterfowl/waterfowl_right.overlay
+++ b/app/boards/shields/waterfowl/waterfowl_right.overlay
@@ -20,7 +20,10 @@
 		;
 };
 
+&roller_right_encoder {
+	status = "okay";
+};
 
-&right_encoder {
+&dial_right_encoder {
 	status = "okay";
 };