diff --git a/buildwrapper.sh b/buildwrapper.sh
index f0aeb5a..1ca1b02 100755
--- a/buildwrapper.sh
+++ b/buildwrapper.sh
@@ -75,9 +75,6 @@ openssl pkcs8 -topk8 -nocrypt -in $CLIENT_PATH/private.key -out $CLIENT_PATH/pri
 openssl pkcs8 -topk8 -nocrypt -in $SERVER_PATH/private.key -out $SERVER_PATH/private.pem
 openssl pkcs8 -topk8 -nocrypt -in $TEST_PATH/private.key -out $TEST_PATH/private.pem
 
-echo "[+] creating combine trust store"
-cat $SERVER_PATH/ca.crt $CLIENT_PATH/ca.crt > resources/truststore.pem
-
 echo "[+] initiating gradle build"
 ./gradlew clean build
 
@@ -103,8 +100,8 @@ rm staging/server/JobServ/bin/jobserv-client staging/server/JobServ/bin/jobserv-
 echo "[+] populating certificates"
 cp resources/server/server.crt staging/server/
 cp resources/server/private.pem staging/server/
-cp resources/truststore.pem staging/server/
+cp resources/client/ca.crt staging/server/
 cp resources/client/client.crt staging/client/
 cp resources/client/private.pem staging/client/
-cp resources/truststore.pem staging/client/
+cp resources/server/ca.crt staging/client/
 cp -r resources/* staging/test/