diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 49241bc..0e1805d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,8 +15,8 @@ jobs:
     # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    name: 'Ubuntu 20.04 Build'
-    runs-on: ubuntu-20.04
+    name: 'Ubuntu 22.04 Build'
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v3
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index be0c109..7065623 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -15,8 +15,8 @@ jobs:
     # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    name: 'Ubuntu 20.04 Build'
-    runs-on: ubuntu-20.04
+    name: 'Ubuntu 22.04 Build'
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v3
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c3d96e..867da4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,7 @@ if ( ACK_BUILD_TESTS )
   add_test( ack_gen_tests ${CMAKE_BINARY_DIR}/tests/ack_gen_tests )
   add_test( ack_rsa_tests ${CMAKE_BINARY_DIR}/tests/ack_rsa_tests )
   add_test( ack_ecc_tests ${CMAKE_BINARY_DIR}/tests/ack_ecc_tests )
+  set_tests_properties( ack_ecc_tests PROPERTIES TIMEOUT 3000     ) # 50 mins
 endif( ACK_BUILD_TESTS )
 
 message( "No intrinsics................${ACK_NO_INTRINSICS}"    )