diff --git a/.github/workflows/gen-client.yaml b/.github/workflows/gen-client.yaml
index 1bb95d9..7848109 100644
--- a/.github/workflows/gen-client.yaml
+++ b/.github/workflows/gen-client.yaml
@@ -1,16 +1,27 @@
 name: Generate Java API Client
 
+permissions:
+    packages: write
 on:
     push:
-      branches:
-        - main
     workflow_dispatch:
 jobs:
   generate-client:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Swagger Codegen
-        uses: bjerkio/swagger-codegen-action@v1
+      - name: Setup Java JDK
+        uses: actions/setup-java@v4.7.1
         with:
-          args: generate -l java -c openapi-java-client.yaml -i swagger-v4.4.yaml
+          distribution: 'temurin'
+          java-version: '11'
+          cache: 'maven'
+      - run: 'mvn package'
+        env:
+          GITHUB_ACTOR: "token"
+          GITHUB_TOKEN: ${{ github.token }}
+      - run: 'mvn deploy:deploy'
+        if: github.ref_name == 'main'
+        env:
+          GITHUB_ACTOR: "token"
+          GITHUB_TOKEN: ${{ github.token }}
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9f97022
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target/
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..e0f15db
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "automatic"
+}
\ No newline at end of file
diff --git a/openapi-java-client.yaml b/openapi-java-client.yaml
deleted file mode 100644
index 5b3d0c1..0000000
--- a/openapi-java-client.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-additionalProperties:
-  groupId: io.theworldavatar
-  artifactId: swagger-java-client
-  artifactVersion: 4.4.0
-  modelPackage: io.theworldavatar.swagger.podman.model
-  apiPackage: io.theworldavatar.swagger.podman.api
-  dateLibrary: legacy
-  library: jersey2
-  apis:
-  apiTests: false
-  apiDocs: false
-  models:
-  modelTests: false
-  modelDocs: false
-  supportingFiles:
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..d4daaf4
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>io.theworldavatar</groupId>
+    <artifactId>podman-java-client</artifactId>
+    <version>${revision}-SNAPSHOT</version>
+
+    <name>Podman Java Client</name>
+    <url>https://theworldavatar.io</url>
+
+    <parent>
+        <groupId>uk.ac.cam.cares.jps</groupId>
+        <artifactId>jps-parent-pom</artifactId>
+        <version>2.3.2</version>
+    </parent>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.release>11</maven.compiler.release>
+        <revision>4.4.0</revision>
+        <!--podman.file>https://storage.googleapis.com/libpod-master-releases/swagger-v4.4.yaml</podman.file-->
+        <podman.file>${project.basedir}/swagger-v${revision}.yaml</podman.file>
+
+    </properties>
+
+    <!-- Repository locations to fetch from -->
+    <repositories>
+        <repository>
+            <id>github</id>
+            <name>The World Avatar Maven Repository</name>
+            <url>https://maven.pkg.github.com/TheWorldAvatar/*</url>
+        </repository>
+    </repositories>
+
+    <!-- Repository locations to deploy to -->
+    <distributionManagement>
+        <repository>
+            <id>github</id>
+            <name>The World Avatar stack Maven Repository</name>
+            <url>https://maven.pkg.github.com/TheWorldAvatar/podman-java-client/</url>
+        </repository>
+        <snapshotRepository>
+            <id>github</id>
+            <name>The World Avatar stack Maven Repository</name>
+            <url>https://maven.pkg.github.com/TheWorldAvatar/podman-java-client/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jdk8</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
+        <!--
+        https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310 -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.glassfish.jersey.core/jersey-client -->
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-client</artifactId>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.glassfish.jersey.media/jersey-media-json-jackson -->
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-json-jackson</artifactId>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.glassfish.jersey.media/jersey-media-multipart -->
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-multipart</artifactId>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.brsanthu/migbase64 -->
+        <dependency>
+            <groupId>com.brsanthu</groupId>
+            <artifactId>migbase64</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+
+        <plugins>
+
+            <plugin>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-codegen-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <?m2e execute onConfiguration?>
+                        <id>generate-swagger-client</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <inputSpec>${podman.file}</inputSpec>
+                            <language>java</language>
+                            <modelPackage>${project.groupId}.swagger.podman.model</modelPackage>
+                            <apiPackage>${project.groupId}.swagger.podman.api</apiPackage>
+                            <configOptions>
+                                <dateLibrary>legacy</dateLibrary>
+                                <library>jersey2</library>
+                            </configOptions>
+                            <addCompileSourceRoot>true</addCompileSourceRoot>
+                            <generateApis>true</generateApis>
+                            <generateApiTests>false</generateApiTests>
+                            <generateApiDocumentation>false</generateApiDocumentation>
+                            <generateModels>true</generateModels>
+                            <modelsToGenerate></modelsToGenerate>
+                            <generateModelTests>false</generateModelTests>
+                            <generateModelDocumentation>false</generateModelDocumentation>
+                            <generateSupportingFiles>true</generateSupportingFiles>
+                            <supportingFilesToGenerate></supportingFilesToGenerate>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/swagger-v4.4.yaml b/swagger-v4.4.0.yaml
similarity index 100%
rename from swagger-v4.4.yaml
rename to swagger-v4.4.0.yaml