diff --git a/.github/workflows/test_ardc_nrt.yml b/.github/workflows/test_ardc_nrt.yml
index d13eae8e..5ff1e439 100755
--- a/.github/workflows/test_ardc_nrt.yml
+++ b/.github/workflows/test_ardc_nrt.yml
@@ -24,11 +24,14 @@ jobs:
         with:
           activate-environment: ardc_nrt
           environment-file: AODN/AODN-WAVE-NRT/ARDC_API_NRT/environment.yml
+          auto-activate-base: false  # Prevent activating base env
 
       - name: Install dependencies
         shell: bash -el {0}
         run: |
           conda install --yes mamba
+          mamba env create --name ardc_nrt --file environment.yml || true  # Create only if not exists
+          conda activate ardc_nrt
           mamba env update --name ardc_nrt --file AODN/AODN-WAVE-NRT/ARDC_API_NRT/environment.yml
 
       - name: Activate Conda environment
diff --git a/.github/workflows/test_data_services.yml b/.github/workflows/test_data_services.yml
index c19807a4..ced89f4c 100755
--- a/.github/workflows/test_data_services.yml
+++ b/.github/workflows/test_data_services.yml
@@ -24,11 +24,14 @@ jobs:
         with:
           activate-environment: data_services_3.8
           environment-file: environment.yml
+          auto-activate-base: false  # Prevent activating base env
 
       - name: Install dependencies
         shell: bash -el {0}
         run: |
           conda install --yes mamba
+          mamba env create --name data_services_3.8 --file environment.yml || true  # Create only if not exists
+          conda activate data_services_3.8
           mamba env update --name data_services_3.8 --file environment.yml
 
       - name: Activate Conda environment
diff --git a/AODN/AODN-WAVE-NRT/ARDC_API_NRT/ardc_nrt/ardc_sofar_nrt.py b/AODN/AODN-WAVE-NRT/ARDC_API_NRT/ardc_nrt/ardc_sofar_nrt.py
index 17f7c889..82de7be6 100755
--- a/AODN/AODN-WAVE-NRT/ARDC_API_NRT/ardc_nrt/ardc_sofar_nrt.py
+++ b/AODN/AODN-WAVE-NRT/ARDC_API_NRT/ardc_nrt/ardc_sofar_nrt.py
@@ -67,6 +67,7 @@ def process_wave_source_id(source_id, incoming_path=None):
             return
 
         if data is not None:
+            data = data.dropna(subset = ['latitude', 'longitude'], how = 'all') # Remove rows associated with NAs for lat/long columns
             template_dirpath = config.conf_dirpath
             process_wave_dataframe(data, source_id, template_dirpath, OUTPUT_PATH, incoming_path)