diff --git a/Makefile b/Makefile
index 990b5e4ac475622c9c9309402dea3603d9ee3104..2c62a031ca005d82e9a3dd8418eaa9149ad12556 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,12 @@ deploy-dockerhub-docs:
 verify:
 	sudo nginx -t
 
-build: build-swagger
+build:
 	mkdocs build
+	bash ./swagger/generate.sh
 
 build-swagger:
-	cd ./swagger && bash ./generate.sh
+	bash ./swagger/generate.sh
 
 deploy-docs:
 	tar czfv ./final.tar.gz ./final
diff --git a/swagger/generate.sh b/swagger/generate.sh
index 8b8298d2216e825c86272647feb2c22a24246284..c089d44f5b03f68f71b3c4dfdf1b76f3e6eeac0e 100755
--- a/swagger/generate.sh
+++ b/swagger/generate.sh
@@ -9,36 +9,37 @@ services[9099]=metadata
 
 function retrieve () {
   echo "... retrieving swagger yaml"
-  wget "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/.docs/api-$2.yaml" -O "./api-$2.yaml" -q
+  wget "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/.docs/api-$2.yaml" -O "./swagger/api-$2.yaml" -q
 }
 
 function generate () {
   echo "... generate python api"
-  java -jar swagger-codegen-cli.jar generate -i "./api-$1.yaml" -l python -o "./api-$1" > /dev/null
+  java -jar swagger-codegen-cli.jar generate -i "./swagger/api-$1.yaml" -l python -o "./swagger/api-$1" > /dev/null
 }
 
 function remove () {
   echo "... removing old python api"
-  rm -rf "./api/api_$1"
+  rm -rf "./swagger/api/api_$1"
 }
 
 function copy () {
   #echo "... copying python api"
   #cp -r "./api-$1/swagger_client" "./api/api_$1"
-  cp "./api-$1.yaml" "./$1/api.yaml"
-  cp -r ../dist/* "./$1"
+  echo "... copy the swagger docs"
+  cp "./swagger/api-$1.yaml" "./swagger/$1/api.yaml"
+  cp -r ./dist/* "./swagger/$1"
 }
 
 function replace () {
   echo "... replacing swagger client package name and gateway"
-  find "./api/api_$2" -type f -exec sed -i -e "s/swagger_client/api_$2/g" {} \;
-  find "./api/api_$2" -type f -exec sed -i -e "s/self.host = .*/self.host = \"http:\/\/localhost:9095\"/g" {} \;
+  find "./swagger/api/api_$2" -type f -exec sed -i -e "s/swagger_client/api_$2/g" {} \;
+  find "./swagger/api/api_$2" -type f -exec sed -i -e "s/self.host = .*/self.host = \"http:\/\/localhost:9095\"/g" {} \;
 }
 
 function move () {
   echo "... moving swagger static files"
-  mkdir -p ../site/swagger
-  cp -r "./$1" ../site/swagger
+  mkdir -p ./site/swagger
+  cp -r "./swagger/$1" ./site/swagger
 }
 
 for key in "${!services[@]}"; do