diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml
index c0577236..9207a8ea 100644
--- a/.github/workflows/zephyr.yml
+++ b/.github/workflows/zephyr.yml
@@ -36,16 +36,6 @@ jobs:
               find twister-out.unit_testing -name $file -exec rm -rf {} \; || true 
             done
 
-      - name: Twister Tests samples
-        working-directory: bacnet-stack
-        run: |
-          rm -rf twister-out.samples &&
-          ../zephyr/scripts/twister -O twister-out.samples -T zephyr/samples --integration &&
-          for file in CMakeFiles CMakeCache.txt cmake_install.cmake Makefile
-            do
-              find twister-out.samples -name $file -exec rm -rf {} \; || true
-            done
-
       - name: Archive firmware
         uses: actions/upload-artifact@v4
         with:
diff --git a/ports/zephyr/bip-init.c b/ports/zephyr/bip-init.c
index 5d96eb36..f4fee776 100644
--- a/ports/zephyr/bip-init.c
+++ b/ports/zephyr/bip-init.c
@@ -11,7 +11,6 @@
 #include <zephyr/init.h>
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
-#include <zephyr/net/net_if.h>
 #include <zephyr/net/net_ip.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/socket_select.h>
@@ -322,7 +321,7 @@ uint16_t bip_receive(
     /* see if there is a packet for us */
     if (zsock_select(max + 1, &read_fds, NULL, NULL, &select_timeout) > 0) {
         socket =
-            ZSOCK_FD_ISSET(BIP_Socket, &read_fds) ? BIP_Socket : BIP_Broadcast_Socket;
+            FD_ISSET(BIP_Socket, &read_fds) ? BIP_Socket : BIP_Broadcast_Socket;
         received_bytes = zsock_recvfrom(socket, (char *)&npdu[0], max_npdu, 0,
             (struct sockaddr *)&sin, &sin_len);
     } else {
@@ -407,7 +406,6 @@ int bip_send_pdu(BACNET_ADDRESS *dest,
  */
 void bip_set_interface(char *ifname)
 {
-#if 0 //{TODO: Fix build errors for native_posix
     struct net_if *iface = 0;
     int index = -1;
     uint8_t x = 0;
@@ -492,7 +490,6 @@ void bip_set_interface(char *ifname)
     } else {
         LOG_ERR("%s:%d - Failed to set iface", THIS_FILE, __LINE__);
     }
-#endif //}TODO:
 }
 
 static int createSocket(struct sockaddr_in *sin)
diff --git a/ports/zephyr/bip6-init.c b/ports/zephyr/bip6-init.c
index 6e74aa94..5c0cf6c3 100644
--- a/ports/zephyr/bip6-init.c
+++ b/ports/zephyr/bip6-init.c
@@ -11,7 +11,6 @@
 #include <zephyr/init.h>
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
-#include <zephyr/net/net_if.h>
 #include <zephyr/net/net_ip.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/socket_select.h>
diff --git a/west.yml b/west.yml
index e56fd8e6..26b5df58 100644
--- a/west.yml
+++ b/west.yml
@@ -21,6 +21,8 @@
 #     <workspace>
 
 manifest:
+  version: 0.13
+
   remotes:
     - name: bacnet-stack
       url-base: https://github.com/bacnet-stack
@@ -36,7 +38,7 @@ manifest:
   projects:
     - name: zephyr
       path: zephyr
-      revision: v3.7.0
+      revision: v3.6.0
       remote: zephyrproject-rtos
       west-commands: scripts/west-commands.yml
       import:
diff --git a/zephyr/samples/hello_bacnet_stack/sample.yaml b/zephyr/samples/hello_bacnet_stack/sample.yaml
index 5ff958c8..1827fb56 100644
--- a/zephyr/samples/hello_bacnet_stack/sample.yaml
+++ b/zephyr/samples/hello_bacnet_stack/sample.yaml
@@ -5,12 +5,11 @@ sample:
 common:
     tags: introduction
     harness: console
-    integration_platforms:
-      - native_posix
     harness_config:
       type: one_line
       regex:
         - "Hello BACnet-Stack! (.*)"
 tests:
   bacnet-stack.sample.basic.hello_bacnet_stack:
+    platform_allow: native_posix
     tags: introduction
diff --git a/zephyr/samples/profiles/b-ss/sample.yaml b/zephyr/samples/profiles/b-ss/sample.yaml
index 2cc87656..97072ff6 100644
--- a/zephyr/samples/profiles/b-ss/sample.yaml
+++ b/zephyr/samples/profiles/b-ss/sample.yaml
@@ -4,6 +4,4 @@ sample:
 tests:
   bacnet-stack.sample.profile.b-ss:
     tags: bacnet
-    build_only: true  # TODO: Remove when sample runs correctly on Zephyr v3.7.0
-    integration_platforms:
-      - native_posix
+    platform_allow: qemu_x86 native_posix native_posix_64 native_sim