diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8aa36ec3..a6167608 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -112,7 +112,7 @@ jobs:
             #container: snowstep/llvm:debian-12-latest
 
           # https://hub.docker.com/r/phhargrove/llvm-flang/tags
-          - os: ubuntu-26.04-arm
+          - os: ubuntu-24.04-arm
             compiler: flang
             version: 23
             container: phhargrove/llvm-flang:23.1.0_rc3-latest-arm64
@@ -230,7 +230,7 @@ jobs:
             version: 22
             network: udp
             container: phhargrove/llvm-flang:22.1.0-latest
-          - os: ubuntu-26.04-arm
+          - os: ubuntu-24.04-arm
             compiler: flang
             network: udp
             version: 23
diff --git a/app/native-multi-image.F90 b/app/native-multi-image.F90
index 4e150bbb..b8b09182 100644
--- a/app/native-multi-image.F90
+++ b/app/native-multi-image.F90
@@ -508,9 +508,6 @@ program native_multi_image
 
 # if HAVE_TEAM_TYPE
       CHECK_TYPE_COMPLIANCE(TEAM_TYPE, default_team, .true., 0)
-#   if __LFORTRAN__
-      if (.false.) SYNC TEAM(default_team) ! workaround LFortran issue #12538
-#   endif
 # endif
 # if HAVE_GET_TEAM
     STATUS("Testing GET_TEAM...")
@@ -880,9 +877,6 @@ subroutine check_type(type_name, is_team, min_size, subject_size, default_bytes)
           fail_count = fail_count + 1
         end if
         STATUS("  Default init of " // type_name // " ==> " // diag)
-#       if __LFORTRAN__
-          if (.false.) SYNC TEAM(team_var) ! workaround LFortran issue #12538
-#       endif          
 #     endif
       else
 #     if TYPES_IMPORT_PRIF