diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index 4a432ff..283c504 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -5,7 +5,7 @@ on: [push]
 jobs:
   codecov:
     container: 
-      image: swift:5.9
+      image: swift:6.0
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 22082ab..783cb58 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -15,7 +15,10 @@ jobs:
         image:
           - swift:5.9-focal
           - swift:5.9-jammy
-          - swift:5.9-amazonlinux2
+          - swift:5.10-focal
+          - swift:5.10-jammy
+          - swift:6.0-focal
+          - swift:6.0-jammy
     container: ${{ matrix.image }}
     steps:
     - name: Checkout code
diff --git a/Dockerfile b/Dockerfile
index 44bbe08..a9cff17 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM swift:5.9 as builder
+FROM swift:6.0 AS builder
 
 # Install OS updates and, if needed, sqlite3
 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
@@ -52,7 +52,7 @@ RUN bin_path="$(swift build --package-path /build -c release --show-bin-path)" \
 ## Production image
 #
 
-FROM swift:5.9
+FROM swift:6.0
 
 # DEBIAN_FRONTEND=noninteractive for automatic UTC configuration in tzdata
 # Make sure all system packages are up to date.
diff --git a/Package.resolved b/Package.resolved
index 0755339..8e34ded 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -275,8 +275,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-log.git",
       "state" : {
-        "revision" : "532d8b529501fb73a2455b179e0bbb6d49b652ed",
-        "version" : "1.5.3"
+        "revision" : "3d8596ed08bd13520157f0355e35caed215ffbfa",
+        "version" : "1.6.3"
       }
     },
     {
@@ -422,15 +422,6 @@
         "revision" : "0d9ee7ea8c4ebd4a489ad7a73d5c6cad55d6fed3",
         "version" : "5.0.6"
       }
-    },
-    {
-      "identity" : "zipfoundation",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/weichsel/ZIPFoundation.git",
-      "state" : {
-        "revision" : "b979e8b52c7ae7f3f39fa0182e738e9e7257eb78",
-        "version" : "0.9.18"
-      }
     }
   ],
   "version" : 2
diff --git a/Package.swift b/Package.swift
index d67f500..a157945 100644
--- a/Package.swift
+++ b/Package.swift
@@ -23,7 +23,7 @@ let package = Package(
         .package(url: "https://github.com/mattpolzin/VaporTypedRoutes.git", .upToNextMinor(from: "0.10.0")),
         .package(url: "https://github.com/mattpolzin/VaporOpenAPI.git", .upToNextMinor(from: "0.6.0")),
 
-        .package(url: "https://github.com/weichsel/ZIPFoundation.git", .upToNextMinor(from: "0.9.17")),
+//        .package(url: "https://github.com/weichsel/ZIPFoundation.git", .upToNextMinor(from: "0.9.17")),
 
         .package(url: "https://github.com/mattpolzin/JSONAPI-OpenAPI.git", .upToNextMinor(from: "0.31.0")),
         .package(url: "https://github.com/mattpolzin/OpenAPIKit.git", from: "3.0.0"),
@@ -94,7 +94,7 @@ let package = Package(
             .product(name: "JSONAPIOpenAPI", package: "JSONAPI-OpenAPI"),
             .product(name: "OpenAPIKit30", package: "OpenAPIKit"),
             .product(name: "JSONAPISwiftGen", package: "JSONAPI-OpenAPI"),
-            .product(name: "ZIPFoundation", package: "ZIPFoundation")
+//            .product(name: "ZIPFoundation", package: "ZIPFoundation")
         ])
     ]
 )
diff --git a/Sources/SwiftGen/ApiTestPackageSwiftGen.swift b/Sources/SwiftGen/ApiTestPackageSwiftGen.swift
index 9fdf135..8f72b29 100644
--- a/Sources/SwiftGen/ApiTestPackageSwiftGen.swift
+++ b/Sources/SwiftGen/ApiTestPackageSwiftGen.swift
@@ -8,7 +8,7 @@
 import Foundation
 import OpenAPIKit30
 import JSONAPISwiftGen
-import ZIPFoundation
+//import ZIPFoundation
 
 public protocol Logger {
     func error(path: String?, context: String, message: String)
@@ -517,7 +517,8 @@ func archive(from sourcePath: String, to archiveFilePath: String) throws {
         try fileManager.removeItem(atPath: archiveFilePath)
     }
 
-    try fileManager.zipItem(at: source, to: destination)
+    throw TestPackageSwiftError.executionFailed(stdout: "NEED TO REPLACE ZIPFOUNDATION LIBRARY")
+//    try fileManager.zipItem(at: source, to: destination)
 }
 
 struct DeclNode: Equatable {