diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index b0cfcd90..537815e3 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -55,7 +55,7 @@ jobs:
   tests_podmanv5:
     runs-on: ubuntu-latest
     container:
-      image: quay.io/podman/upstream:latest
+      image: quay.io/containers/podman:v5
       volumes:
         - container_volume:/var/lib/containers
       options: "--device /dev/fuse:rw --security-opt label=disable --security-opt seccomp=unconfined --privileged"
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 7a8401c1..ed267e0a 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -91,7 +91,7 @@ jobs:
   tests_podmanv5:
     runs-on: ubuntu-latest
     container:
-      image: quay.io/podman/upstream:latest
+      image: quay.io/containers/podman:v5
       volumes:
         - container_volume:/var/lib/containers
       options: "--device /dev/fuse:rw --security-opt label=disable --security-opt seccomp=unconfined --privileged"
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 7bf01010..c9614032 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -5,7 +5,7 @@
 We as members, contributors, and leaders pledge to make participation in our
 community a harassment-free experience for everyone, regardless of age, body
 size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
+identity and expression, level of experience, education, socioeconomic status,
 nationality, personal appearance, race, religion, or sexual identity
 and orientation.