diff --git a/salt/osmap.yaml b/salt/osmap.yaml
index 636bcc8..5abc7a5 100644
--- a/salt/osmap.yaml
+++ b/salt/osmap.yaml
@@ -64,15 +64,15 @@ MacOS:
   salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
 
 FreeBSD:
-  salt_master: py37-salt
-  salt_minion: py37-salt
-  salt_syndic: py37-salt
-  salt_cloud: py37-salt
-  salt_api: py37-salt
-  salt_ssh: py37-salt
-  python_git: py37-GitPython
-  pygit2: py37-pygit2
-  python_dulwich: py37-dulwich
+  salt_master: py38-salt
+  salt_minion: py38-salt
+  salt_syndic: py38-salt
+  salt_cloud: py38-salt
+  salt_api: py38-salt
+  salt_ssh: py38-salt
+  python_git: py38-gitpython
+  pygit2: py38-pygit2
+  python_dulwich: py38-dulwich
 
 # If `osfingermap.yaml` is introduced in the future, perhaps better to move to there,
 # since this is probably specific to `OpenBSD-6`
diff --git a/test/integration/v3000-py2/controls/pkgs_spec.rb b/test/integration/v3000-py2/controls/pkgs_spec.rb
index 818f70e..d0f9555 100644
--- a/test/integration/v3000-py2/controls/pkgs_spec.rb
+++ b/test/integration/v3000-py2/controls/pkgs_spec.rb
@@ -5,7 +5,7 @@ pkgs =
   when 'arch'
     %w[salt]
   when /bsd$/
-    %w[py37-salt-3002.6]
+    %w[py38-salt-3002.6]
   when 'windows'
     %w[Salt\ Minion]
   else
diff --git a/test/integration/v3000-py3/controls/pkgs_spec.rb b/test/integration/v3000-py3/controls/pkgs_spec.rb
index 818f70e..d0f9555 100644
--- a/test/integration/v3000-py3/controls/pkgs_spec.rb
+++ b/test/integration/v3000-py3/controls/pkgs_spec.rb
@@ -5,7 +5,7 @@ pkgs =
   when 'arch'
     %w[salt]
   when /bsd$/
-    %w[py37-salt-3002.6]
+    %w[py38-salt-3002.6]
   when 'windows'
     %w[Salt\ Minion]
   else
diff --git a/test/integration/v3001-py3/controls/pkgs_spec.rb b/test/integration/v3001-py3/controls/pkgs_spec.rb
index 4ba2b86..a8e1ad3 100644
--- a/test/integration/v3001-py3/controls/pkgs_spec.rb
+++ b/test/integration/v3001-py3/controls/pkgs_spec.rb
@@ -5,7 +5,7 @@ pkgs =
   when 'arch'
     %w[salt]
   when /bsd$/
-    %w[py37-salt-3002.6]
+    %w[py38-salt-3002.6]
   when 'windows'
     %w[Salt\ Minion]
   else
diff --git a/test/integration/v3002-py3/controls/pkgs_spec.rb b/test/integration/v3002-py3/controls/pkgs_spec.rb
index a3462d0..791f298 100644
--- a/test/integration/v3002-py3/controls/pkgs_spec.rb
+++ b/test/integration/v3002-py3/controls/pkgs_spec.rb
@@ -5,7 +5,7 @@ pkgs =
   when 'arch'
     %w[salt]
   when /bsd$/
-    %w[py37-salt]
+    %w[py38-salt]
   when 'windows'
     %w[Salt\ Minion]
   else
diff --git a/test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml b/test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml
index fc4e15a..58ee588 100644
--- a/test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml
+++ b/test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml
@@ -86,9 +86,9 @@ values:
     pin_version: false
     pkgrepo: ''
     py_ver: py3
-    pygit2: py37-pygit2
-    python_dulwich: py37-dulwich
-    python_git: py37-GitPython
+    pygit2: py38-pygit2
+    python_dulwich: py38-dulwich
+    python_git: py38-gitpython
     release: '3002'
     restart_via_at: false
     retry_options:
@@ -98,14 +98,14 @@ values:
       until: true
     rootgroup: wheel
     rootuser: root
-    salt_api: py37-salt
-    salt_cloud: py37-salt
-    salt_master: py37-salt
+    salt_api: py38-salt
+    salt_cloud: py38-salt
+    salt_master: py38-salt
     salt_master_macos_plist_hash: ''
-    salt_minion: py37-salt
+    salt_minion: py38-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py37-salt
-    salt_syndic: py37-salt
+    salt_ssh: py38-salt
+    salt_syndic: py38-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false
diff --git a/test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml b/test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml
index 9b3ad66..364b764 100644
--- a/test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml
+++ b/test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml
@@ -86,9 +86,9 @@ values:
     pin_version: false
     pkgrepo: ''
     py_ver: py3
-    pygit2: py37-pygit2
-    python_dulwich: py37-dulwich
-    python_git: py37-GitPython
+    pygit2: py38-pygit2
+    python_dulwich: py38-dulwich
+    python_git: py38-gitpython
     release: '3002'
     restart_via_at: false
     retry_options:
@@ -98,14 +98,14 @@ values:
       until: true
     rootgroup: wheel
     rootuser: root
-    salt_api: py37-salt
-    salt_cloud: py37-salt
-    salt_master: py37-salt
+    salt_api: py38-salt
+    salt_cloud: py38-salt
+    salt_master: py38-salt
     salt_master_macos_plist_hash: ''
-    salt_minion: py37-salt
+    salt_minion: py38-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py37-salt
-    salt_syndic: py37-salt
+    salt_ssh: py38-salt
+    salt_syndic: py38-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false
diff --git a/test/integration/v3002-py3/files/_mapdata/freebsd-13.yaml b/test/integration/v3002-py3/files/_mapdata/freebsd-13.yaml
index 629ef8c..e096906 100644
--- a/test/integration/v3002-py3/files/_mapdata/freebsd-13.yaml
+++ b/test/integration/v3002-py3/files/_mapdata/freebsd-13.yaml
@@ -86,9 +86,9 @@ values:
     pin_version: false
     pkgrepo: ''
     py_ver: py3
-    pygit2: py37-pygit2
-    python_dulwich: py37-dulwich
-    python_git: py37-GitPython
+    pygit2: py38-pygit2
+    python_dulwich: py38-dulwich
+    python_git: py38-gitpython
     release: '3002'
     restart_via_at: false
     retry_options:
@@ -98,14 +98,14 @@ values:
       until: true
     rootgroup: wheel
     rootuser: root
-    salt_api: py37-salt
-    salt_cloud: py37-salt
-    salt_master: py37-salt
+    salt_api: py38-salt
+    salt_cloud: py38-salt
+    salt_master: py38-salt
     salt_master_macos_plist_hash: ''
-    salt_minion: py37-salt
+    salt_minion: py38-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py37-salt
-    salt_syndic: py37-salt
+    salt_ssh: py38-salt
+    salt_syndic: py38-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false
diff --git a/test/integration/v3003-py3/controls/pkgs_spec.rb b/test/integration/v3003-py3/controls/pkgs_spec.rb
index f847a2e..f721d1c 100644
--- a/test/integration/v3003-py3/controls/pkgs_spec.rb
+++ b/test/integration/v3003-py3/controls/pkgs_spec.rb
@@ -5,7 +5,7 @@ pkgs =
   when 'arch'
     %w[salt]
   when /bsd$/
-    %w[py37-salt]
+    %w[py38-salt]
   when 'windows'
     %w[Salt\ Minion]
   else
diff --git a/test/integration/v3003-py3/files/_mapdata/freebsd-11.yaml b/test/integration/v3003-py3/files/_mapdata/freebsd-11.yaml
index 8c6a7e0..f413503 100644
--- a/test/integration/v3003-py3/files/_mapdata/freebsd-11.yaml
+++ b/test/integration/v3003-py3/files/_mapdata/freebsd-11.yaml
@@ -86,9 +86,9 @@ values:
     pin_version: false
     pkgrepo: ''
     py_ver: py3
-    pygit2: py37-pygit2
-    python_dulwich: py37-dulwich
-    python_git: py37-GitPython
+    pygit2: py38-pygit2
+    python_dulwich: py38-dulwich
+    python_git: py38-gitpython
     release: '3003'
     restart_via_at: false
     retry_options:
@@ -98,14 +98,14 @@ values:
       until: true
     rootgroup: wheel
     rootuser: root
-    salt_api: py37-salt
-    salt_cloud: py37-salt
-    salt_master: py37-salt
+    salt_api: py38-salt
+    salt_cloud: py38-salt
+    salt_master: py38-salt
     salt_master_macos_plist_hash: ''
-    salt_minion: py37-salt
+    salt_minion: py38-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py37-salt
-    salt_syndic: py37-salt
+    salt_ssh: py38-salt
+    salt_syndic: py38-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false
diff --git a/test/integration/v3003-py3/files/_mapdata/freebsd-12.yaml b/test/integration/v3003-py3/files/_mapdata/freebsd-12.yaml
index 521af91..a30de4a 100644
--- a/test/integration/v3003-py3/files/_mapdata/freebsd-12.yaml
+++ b/test/integration/v3003-py3/files/_mapdata/freebsd-12.yaml
@@ -86,9 +86,9 @@ values:
     pin_version: false
     pkgrepo: ''
     py_ver: py3
-    pygit2: py37-pygit2
-    python_dulwich: py37-dulwich
-    python_git: py37-GitPython
+    pygit2: py38-pygit2
+    python_dulwich: py38-dulwich
+    python_git: py38-gitpython
     release: '3003'
     restart_via_at: false
     retry_options:
@@ -98,14 +98,14 @@ values:
       until: true
     rootgroup: wheel
     rootuser: root
-    salt_api: py37-salt
-    salt_cloud: py37-salt
-    salt_master: py37-salt
+    salt_api: py38-salt
+    salt_cloud: py38-salt
+    salt_master: py38-salt
     salt_master_macos_plist_hash: ''
-    salt_minion: py37-salt
+    salt_minion: py38-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py37-salt
-    salt_syndic: py37-salt
+    salt_ssh: py38-salt
+    salt_syndic: py38-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false
diff --git a/test/integration/v3003-py3/files/_mapdata/freebsd-13.yaml b/test/integration/v3003-py3/files/_mapdata/freebsd-13.yaml
index 0a99e08..06e7de0 100644
--- a/test/integration/v3003-py3/files/_mapdata/freebsd-13.yaml
+++ b/test/integration/v3003-py3/files/_mapdata/freebsd-13.yaml
@@ -86,9 +86,9 @@ values:
     pin_version: false
     pkgrepo: ''
     py_ver: py3
-    pygit2: py37-pygit2
-    python_dulwich: py37-dulwich
-    python_git: py37-GitPython
+    pygit2: py38-pygit2
+    python_dulwich: py38-dulwich
+    python_git: py38-gitpython
     release: '3003'
     restart_via_at: false
     retry_options:
@@ -98,14 +98,14 @@ values:
       until: true
     rootgroup: wheel
     rootuser: root
-    salt_api: py37-salt
-    salt_cloud: py37-salt
-    salt_master: py37-salt
+    salt_api: py38-salt
+    salt_cloud: py38-salt
+    salt_master: py38-salt
     salt_master_macos_plist_hash: ''
-    salt_minion: py37-salt
+    salt_minion: py38-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py37-salt
-    salt_syndic: py37-salt
+    salt_ssh: py38-salt
+    salt_syndic: py38-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false