diff --git a/certstrap/certstrap_spec.rb b/certstrap/certstrap_spec.rb
index 680ee977..44e0a8b2 100644
--- a/certstrap/certstrap_spec.rb
+++ b/certstrap/certstrap_spec.rb
@@ -12,7 +12,7 @@
   }
 
   it "installs the right version of Ubuntu Linux" do
-    expect(os_version).to include("Ubuntu 20.04")
+    expect(os_version).to include("Ubuntu 18.04.06")
     expect(os_version).to include("LTS")
   end
 
diff --git a/psql/psql_spec.rb b/psql/psql_spec.rb
index ed336527..54871702 100644
--- a/psql/psql_spec.rb
+++ b/psql/psql_spec.rb
@@ -2,7 +2,7 @@
 require 'docker'
 require 'serverspec'
 
-PSQL_PACKAGE = 'postgresql-client'
+PSQL_PACKAGE = 'postgresql14-client'
 ALPINE_VERSION = "3.16"
 
 describe "psql image" do