diff --git a/.github/workflows/unix_linux.yml b/.github/workflows/unix_linux.yml
index 74f96d0a..71b3fd9e 100644
--- a/.github/workflows/unix_linux.yml
+++ b/.github/workflows/unix_linux.yml
@@ -32,26 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        cubit: [2021.4, 2021.5, 2021.11, 2022.4]
+        cubit: [2023.6-dev]
         os: [ubuntu]
-        os_version: [20.04, 22.04]
-        include:
-          - os: ubuntu
-            os_version: 18.04
-            cubit: 17.1.0
-
-          - os: debian
-            os_version: '10.10'  # using a 'string' here as the 0 gets rounded away otherwise
-            cubit: 2021.5
-
-          - os: debian
-            os_version: '10.10'  # using a 'string' here as the 0 gets rounded away otherwise
-            cubit: 2021.11
-
-          - os: debian
-            os_version: '10.10'  # using a 'string' here as the 0 gets rounded away otherwise
-            cubit: 2022.4
-
+        os_version: [22.04]
 
     name: 'Cubit ${{ matrix.cubit }} Build for ${{ matrix.os }} ${{ matrix.os_version }} of Svalinn Plugin'
 
@@ -75,6 +58,7 @@ jobs:
         shell: bash -l {0}
         run: |
           COREFORM_BASE_URL=https://f002.backblazeb2.com/file/cubit-downloads/Coreform-Cubit/Releases
+          SUFFIX=Lin64
 
           if [ "${{ matrix.cubit }}" == "17.1.0" ]; then
             BASE=Trelis-17.1.0
@@ -97,9 +81,13 @@ jobs:
             BASE=Coreform-Cubit-2022.4%2B26186_e1209cf7
             CUBIT_BASE_NAME=Coreform-Cubit-2022.4
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
+          elif [ "${{ matrix.cubit }}" == "2023.6-dev" ]; then
+            COREFORM_BASE_URL=https://f002.backblazeb2.com/file/cubit-downloads/Coreform-Cubit/master
+            BASE=Coreform-Cubit-2023.6-rc%2B38128
+            CUBIT_BASE_NAME=Coreform-Cubit-2023.6
+            HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
           fi
 
-          SUFFIX=Lin64
           EXT=deb
           echo "SED=sed" >> $GITHUB_ENV
           echo "BUILD_SHARED_LIBS=ON" >> $GITHUB_ENV
diff --git a/.github/workflows/unix_mac.yml b/.github/workflows/unix_mac.yml
index 1e604535..1fb00df2 100644
--- a/.github/workflows/unix_mac.yml
+++ b/.github/workflows/unix_mac.yml
@@ -34,7 +34,7 @@ jobs:
     runs-on: macos-11
     strategy:
       matrix:
-        cubit: [17.1.0, 2021.4, 2021.5, 2021.11, 2022.4]
+        cubit: [17.1.0, 2021.4, 2021.5, 2021.11, 2022.4, 2023.4]
 
     name: 'Cubit ${{ matrix.cubit }} Build for MacOS of Svalinn Plugin'
 
@@ -45,6 +45,7 @@ jobs:
         shell: bash -l {0}
         run: |
           COREFORM_BASE_URL=https://f002.backblazeb2.com/file/cubit-downloads/Coreform-Cubit/Releases
+          EXT=dmg
 
           if [ "${{ matrix.cubit }}" == "17.1.0" ]; then
             BASE=Trelis-17.1.0
@@ -67,10 +68,14 @@ jobs:
             BASE=Coreform-Cubit-2022.4%2B26186_e1209cf7
             CUBIT_BASE_NAME=Coreform-Cubit-2022.4
             HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
+          elif [ "${{ matrix.cubit }}" == "2023.4" ]; then
+            BASE=Coreform-Cubit-2023.4%2B36047
+            CUBIT_BASE_NAME=Coreform-Cubit-2023.4
+            HDF5_PATH=/usr/local/HDF_Group/HDF5/1.12.0
+            EXT=pkg
           fi
 
           SUFFIX=Mac64
-          EXT=dmg
           echo "SED=gsed" >> $GITHUB_ENV
           echo "BUILD_SHARED_LIBS=OFF" >> $GITHUB_ENV
           echo "BUILD_STATIC_LIBS=ON" >> $GITHUB_ENV
diff --git a/scripts/unix_share_build.sh b/scripts/unix_share_build.sh
index 16b5ad8d..3628bb61 100644
--- a/scripts/unix_share_build.sh
+++ b/scripts/unix_share_build.sh
@@ -76,6 +76,8 @@ function setup_var() {
         CUBIT_PATH="/opt/Coreform-Cubit-2021.4"
     elif [ "$1" == "2022.4" ] ; then
         CUBIT_PATH="/opt/Coreform-Cubit-2022.4"
+    elif [ "$1" == "2023.6-dev" ] ; then
+        CUBIT_PATH="/opt/Coreform-Cubit-2023.6"
     else
         echo "unknown Cubit version"
         return 1
@@ -175,7 +177,19 @@ function remove_app_logger() {
     $SUDO $SED -i "s/\/\.\.\/app_logger\;//" CubitUtilConfig.cmake
 }
 
-function mac_setup_cubit() {
+function mac_setup_cubit () {
+    if [ "${CUBIT_PKG##*.}" == "pkg" ]; then
+        mac_pkg_setup_cubit $1
+    else
+        mac_dmg_setup_cubit $1
+    fi
+}
+function mac_pkg_setup_cubit() {
+    cd ${FOLDER_PKG}
+    sudo installer -pkg ${CUBIT_PKG} -target /
+}
+
+function mac_dmg_setup_cubit() {
     cd ${FOLDER_PKG}
     hdiutil convert ${CUBIT_PKG} -format UDTO -o cubit_eula.dmg.cdr
     hdiutil attach cubit_eula.dmg.cdr -mountpoint /Volumes/Cubit
@@ -214,7 +228,15 @@ function linux_setup_cubit() {
     cd ${FOLDER_PKG}
     $SUDO apt-get install -y ./${CUBIT_PKG}
 
-    if [ "$1" == "2021.3" ] || [ "$1" == "2021.4" ] || [ "$1" == "2021.5" ] || [ "$1" == "2021.11" ] || [ "$1" == "2022.4" ] ; then
+    if [ "$1" == "2023.4" ]; then
+        cd ${CUBIT_PATH}
+        mkdir license_server
+        cd license_server
+        ln -sf ../bin/libcf_license_server.so .
+        ln -sf ../bin/libcf_license_renewals.so .
+    fi
+
+    if [ "$1" == "2021.3" ] || [ "$1" == "2021.4" ] || [ "$1" == "2021.5" ] || [ "$1" == "2021.11" ] || [ "$1" == "2022.4" ] || [ "$1" == "2023.6-dev" ] ; then
 	    return
     fi
 
@@ -236,6 +258,7 @@ function build_plugin(){
     cd bld
     cmake ../Cubit-plugin -DCMAKE_PREFIX_PATH=${CUBIT_PATH} \
                            -DCUBIT_ROOT=${CUBIT_PATH} \
+                           -DCubit_DIR=${CUBIT_PATH} \
                            -DDAGMC_DIR=${PLUGIN_ABS_PATH}/DAGMC \
                            -DCMAKE_BUILD_TYPE=Release \
                             $CMAKE_ADDITIONAL_FLAGS \
@@ -287,7 +310,7 @@ function mac_build_plugin_pkg(){
     install_name_tool -change /usr/local/opt/libaec/lib/libsz.dylib @rpath/libsz.dylib libsvalinn_plugin.so
 
     libsz=libsz.dylib
-    if [ "$1" == "2022.4" ] ; then
+    if [ "$1" == "2022.4" ] || [ "$1" == "2023.6-dev" ] ; then
         libsz=libsz.2.dylib
     fi