diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2831e6a8f..6a02a94fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -330,7 +330,7 @@ else()
     set(GNSSSDR_GTEST_LOCAL_VERSION "1.12.1")
 endif()
 set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
-set(GNSSSDR_GPSTK_LOCAL_VERSION "8.0.0")
+set(GNSSSDR_GPSTK_LOCAL_VERSION "11.2.3")
 set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.23")
 set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.12")
 set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "21.1")
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index d73362ad2..a87357fce 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -361,7 +361,7 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
         endif()
         if(CMAKE_VERSION VERSION_LESS 3.2)
             ExternalProject_Add(gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
-                GIT_REPOSITORY https://github.com/SGL-UT/GPSTk
+                GIT_REPOSITORY https://github.com/SGL-UT/gnsstk
                 GIT_TAG v${GNSSSDR_GPSTK_LOCAL_VERSION}
                 SOURCE_DIR ${CMAKE_BINARY_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
                 BINARY_DIR ${CMAKE_BINARY_DIR}/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
@@ -388,7 +388,7 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
             endif()
 
             ExternalProject_Add(gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
-                GIT_REPOSITORY https://github.com/SGL-UT/GPSTk
+                GIT_REPOSITORY https://github.com/SGL-UT/gnsstk
                 GIT_TAG v${GNSSSDR_GPSTK_LOCAL_VERSION}
                 SOURCE_DIR ${CMAKE_BINARY_DIR}/thirdparty/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
                 BINARY_DIR ${CMAKE_BINARY_DIR}/gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION}
diff --git a/src/tests/data/gpstk_static.patch b/src/tests/data/gpstk_static.patch
index 7acf49dbf..bfddec0e2 100644
--- a/src/tests/data/gpstk_static.patch
+++ b/src/tests/data/gpstk_static.patch
@@ -20,7 +20,7 @@ SPDX-FileCopyrightText: 2020 Carles Fernandez-Prades <carles.fernandez@cttc.es>
  #============================================================
  # Core Library Target Files
  #============================================================
-@@ -160,7 +169,7 @@
+@@ -161,7 +170,7 @@
  add_library( gpstk ${STADYN} ${GPSTK_SRC_FILES} ${GPSTK_INC_FILES} )
 
  # GPSTk library install target
diff --git a/src/utils/rinex2assist/main.cc b/src/utils/rinex2assist/main.cc
index 1b685040d..b80d90604 100644
--- a/src/utils/rinex2assist/main.cc
+++ b/src/utils/rinex2assist/main.cc
@@ -28,6 +28,8 @@
 #include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/serialization/map.hpp>
 #include <gflags/gflags.h>
+#include <gpstk/GALWeekSecond.hpp>
+#include <gpstk/GPSWeekSecond.hpp>
 #include <gpstk/Rinex3NavData.hpp>
 #include <gpstk/Rinex3NavHeader.hpp>
 #include <gpstk/Rinex3NavStream.hpp>
@@ -176,8 +178,8 @@ int main(int argc, char** argv)
                     gps_utc_model.valid = (hdr.valid > 2147483648) ? true : false;
                     gps_utc_model.A1 = hdr.mapTimeCorr["GPUT"].A0;
                     gps_utc_model.A0 = hdr.mapTimeCorr["GPUT"].A1;
-                    gps_utc_model.tot = hdr.mapTimeCorr["GPUT"].refSOW;
-                    gps_utc_model.WN_T = hdr.mapTimeCorr["GPUT"].refWeek;
+                    gps_utc_model.tot = static_cast<gpstk::GPSWeekSecond>(hdr.mapTimeCorr["GPUT"].refTime).sow;
+                    gps_utc_model.WN_T = static_cast<gpstk::GPSWeekSecond>(hdr.mapTimeCorr["GPUT"].refTime).week;
                     gps_utc_model.DeltaT_LS = hdr.leapSeconds;
                     gps_utc_model.WN_LSF = hdr.leapWeek;
                     gps_utc_model.DN = hdr.leapDay;
@@ -199,8 +201,8 @@ int main(int argc, char** argv)
                     gal_utc_model.A0 = hdr.mapTimeCorr["GAUT"].A0;
                     gal_utc_model.A1 = hdr.mapTimeCorr["GAUT"].A1;
                     gal_utc_model.Delta_tLS = hdr.leapSeconds;
-                    gal_utc_model.tot = hdr.mapTimeCorr["GAUT"].refSOW;
-                    gal_utc_model.WNot = hdr.mapTimeCorr["GAUT"].refWeek;
+                    gal_utc_model.tot = static_cast<gpstk::GALWeekSecond>(hdr.mapTimeCorr["GAUT"].refTime).sow;
+                    gal_utc_model.WNot = static_cast<gpstk::GALWeekSecond>(hdr.mapTimeCorr["GAUT"].refTime).week;
                     gal_utc_model.WN_LSF = hdr.leapWeek;
                     gal_utc_model.DN = hdr.leapDay;
                     gal_utc_model.Delta_tLSF = hdr.leapDelta;