diff --git a/.github/workflows/build-wolfprovider.yml b/.github/workflows/build-wolfprovider.yml
index 319c4927..54f68bce 100644
--- a/.github/workflows/build-wolfprovider.yml
+++ b/.github/workflows/build-wolfprovider.yml
@@ -151,7 +151,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
-          fetch-tags: true
 
       # Avoid "detected dubious ownership" warning
       - name: Ensure the working directory safe
@@ -159,13 +158,6 @@ jobs:
         run: |
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
-      # When running on a fork the upstream tags are not present, so fetch them explicitly
-      - name: Fetch tags from upstream(for Debian versioning)
-        if: steps.check_artifact.outcome != 'success'
-        run: |
-          git remote add upstream https://github.com/wolfSSL/wolfProvider.git || true
-          git fetch upstream --tags --no-recurse-submodules
-
       - name: Install wolfProvider
         if: steps.check_artifact.outcome != 'success'
         run: |
diff --git a/include/wolfprovider/internal.h b/include/wolfprovider/internal.h
index 3f570f4b..6c584f1b 100644
--- a/include/wolfprovider/internal.h
+++ b/include/wolfprovider/internal.h
@@ -39,14 +39,7 @@
 #include "wp_params.h"
 
 #ifndef AES_BLOCK_SIZE
-    #include <openssl/aes.h>
-    #ifndef AES_BLOCK_SIZE
-        #ifdef WC_NO_COMPAT_AES_BLOCK_SIZE
-            #define AES_BLOCK_SIZE WC_AES_BLOCK_SIZE
-        #else
-            #error AES_BLOCK_SIZE not defined when it should be
-        #endif
-    #endif
+    #define AES_BLOCK_SIZE 16
 #endif
 
 #ifndef WP_INTERNAL_H
@@ -257,4 +250,3 @@ byte wp_ct_int_mask_lt(int a, int b);
 byte wp_ct_byte_mask_sel(byte mask, byte a, byte b);
 
 #endif /* WP_INTERNAL_H */
-
diff --git a/test/test_cmac.c b/test/test_cmac.c
index 446267f0..f4ab49ed 100644
--- a/test/test_cmac.c
+++ b/test/test_cmac.c
@@ -22,9 +22,6 @@
 #include <openssl/core_names.h>
 
 #include "unit.h"
-#undef AES_BLOCK_SIZE
-#include <wolfssl/options.h>
-#include <wolfssl/wolfcrypt/cmac.h>
 
 #ifdef WP_HAVE_CMAC
 
@@ -262,4 +259,3 @@ int test_cmac_create(void *data)
 
 #endif /* WP_HAVE_CMAC */
 
-
diff --git a/test/test_gmac.c b/test/test_gmac.c
index 0b96cc99..fc023571 100644
--- a/test/test_gmac.c
+++ b/test/test_gmac.c
@@ -22,9 +22,6 @@
 #include <openssl/core_names.h>
 
 #include "unit.h"
-#undef AES_BLOCK_SIZE
-#include <wolfssl/options.h>
-#include <wolfssl/wolfcrypt/aes.h>
 
 #ifdef WP_HAVE_GMAC
 
@@ -195,10 +192,10 @@ int test_gmac_dup(void *data)
     (void)data;
 
     /* Build full messages used for one-shot expected MAC calculations. */
-    XMEMCPY(msgA, prefix, sizeof(prefix));
-    XMEMCPY(msgA + sizeof(prefix), tailA, sizeof(tailA));
-    XMEMCPY(msgB, prefix, sizeof(prefix));
-    XMEMCPY(msgB + sizeof(prefix), tailB, sizeof(tailB));
+    memcpy(msgA, prefix, sizeof(prefix));
+    memcpy(msgA + sizeof(prefix), tailA, sizeof(tailA));
+    memcpy(msgB, prefix, sizeof(prefix));
+    memcpy(msgB + sizeof(prefix), tailB, sizeof(tailB));
 
     /* Compute expected MACs for each post-duplication branch. */
     ret = test_gmac_gen_mac(wpLibCtx, cipher, iv, (int)sizeof(iv), key,
diff --git a/test/unit.h b/test/unit.h
index e79101cd..85b920f0 100644
--- a/test/unit.h
+++ b/test/unit.h
@@ -37,7 +37,6 @@
 #include <openssl/evp.h>
 #include <openssl/ec.h>
 #include <openssl/ssl.h>
-#include <openssl/aes.h>
 #include <openssl/rand.h>
 #include <openssl/kdf.h>
 #include <openssl/core_names.h>
@@ -45,6 +44,10 @@
 #include <wolfprovider/settings.h>
 #include <wolfprovider/wp_logging.h>
 
+#ifndef AES_BLOCK_SIZE
+    #define AES_BLOCK_SIZE 16
+#endif
+
 #ifdef TEST_MULTITHREADED
 #define PRINT_MSG(str)
 #define PRINT_ERR_MSG(str)