diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a813f44c9..7dfcdb542 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,6 +44,8 @@ jobs:
         uses: ./.github/workflows/memcached.yml
     libssh2:
         uses: ./.github/workflows/libssh2.yml
+    openssh:
+        uses: ./.github/workflows/openssh.yml
 # TODO: Currently this test fails. Enable it once it becomes passing.        
 #    haproxy:
 #        uses: ./.github/workflows/haproxy.yml
diff --git a/.github/workflows/openssh.yml b/.github/workflows/openssh.yml
index 77b93c0b6..c9570271a 100644
--- a/.github/workflows/openssh.yml
+++ b/.github/workflows/openssh.yml
@@ -2,8 +2,6 @@ name: openssh Tests
 
 on:
   workflow_call:
-  # TODO: remove this from PR
-  push:
 
 jobs:
   build_wolfssl:
@@ -49,9 +47,7 @@ jobs:
       - name: Checkout OSP
         uses: actions/checkout@v4
         with:
-          # TODO: update with wolfssl repo after merge
-          repository: julek-wolfssl/osp
-          ref: openssh-9.6
+          repository: wolfssl/osp
           path: osp
 
       - name: Build and test openssh
diff --git a/wolfcrypt/src/ed25519.c b/wolfcrypt/src/ed25519.c
index 6dfb7a0f2..373edb919 100644
--- a/wolfcrypt/src/ed25519.c
+++ b/wolfcrypt/src/ed25519.c
@@ -32,6 +32,7 @@
 #ifdef HAVE_ED25519
 
 #include <wolfssl/wolfcrypt/ed25519.h>
+#include <wolfssl/wolfcrypt/ge_operations.h>
 #include <wolfssl/wolfcrypt/error-crypt.h>
 #include <wolfssl/wolfcrypt/hash.h>
 #ifdef NO_INLINE
diff --git a/wolfssl/wolfcrypt/ed25519.h b/wolfssl/wolfcrypt/ed25519.h
index 0d6ef49fc..9748d6dfa 100644
--- a/wolfssl/wolfcrypt/ed25519.h
+++ b/wolfssl/wolfcrypt/ed25519.h
@@ -31,8 +31,6 @@
 
 #ifdef HAVE_ED25519
 
-#include <wolfssl/wolfcrypt/fe_operations.h>
-#include <wolfssl/wolfcrypt/ge_operations.h>
 #include <wolfssl/wolfcrypt/random.h>
 #ifndef WOLFSSL_SHA512
 #error ED25519 requires SHA512