diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/ZkParamsCommand.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/ZkParamsCommand.java
index bce402f650..16dbccf6ee 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/ZkParamsCommand.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/ZkParamsCommand.java
@@ -10,6 +10,8 @@
 import java.util.Base64;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
+import org.signal.libsignal.zkgroup.GenericServerPublicParams;
+import org.signal.libsignal.zkgroup.GenericServerSecretParams;
 import org.signal.libsignal.zkgroup.ServerPublicParams;
 import org.signal.libsignal.zkgroup.ServerSecretParams;
 
@@ -24,13 +26,23 @@ public void configure(Subparser subparser) {
 
   }
 
+  private static String formatKey(byte[] contents) {
+        return Base64.getEncoder().encodeToString(contents);
+      }
+
   @Override
   public void run(Bootstrap<?> bootstrap, Namespace namespace) throws Exception {
     ServerSecretParams serverSecretParams = ServerSecretParams.generate();
     ServerPublicParams serverPublicParams = serverSecretParams.getPublicParams();
 
-    System.out.println("Public: " + Base64.getEncoder().withoutPadding().encodeToString(serverPublicParams.serialize()));
-    System.out.println("Private: " + Base64.getEncoder().withoutPadding().encodeToString(serverSecretParams.serialize()));
+    System.out.println("Public: " + formatKey(serverPublicParams.serialize()));
+    System.out.println("Private: " + formatKey(serverSecretParams.serialize()));
+
+    GenericServerSecretParams genericZkSecretParams = GenericServerSecretParams.generate();
+    GenericServerPublicParams genericZkPublicParams = genericZkSecretParams.getPublicParams();
+
+    System.out.println("zk Public: " + formatKey(genericZkPublicParams.serialize()));
+    System.out.println("zk Private: " + formatKey(genericZkSecretParams.serialize()));
   }
 
 }