diff --git a/cloudbuild.yaml b/.github/cloudbuild.yaml
similarity index 77%
rename from cloudbuild.yaml
rename to .github/cloudbuild.yaml
index db3b73ba..1332d059 100644
--- a/cloudbuild.yaml
+++ b/.github/cloudbuild.yaml
@@ -6,16 +6,21 @@ steps:
     - 'DEV_ENV_IMAGE=${_DEV_ENV_IMAGE}'
     - '--build-arg'
     - 'NUM_PARALLEL_JOBS=${_NUM_CPUS}'
+    - '--build-arg'
+    - 'BUILD_TYPE=${_BUILD_TYPE}'
     - '-t'
     - '${_GCR_ZONE}/$PROJECT_ID/${_IMAGE_NAME}:${SHORT_SHA}'
+    - '-f'
+    - '.github/cloudbuild/Dockerfile'
     - '.'
 options:
   disk_size_gb: 1000
   machine_type: N1_HIGHCPU_32
-timeout: '21600s'
+timeout: '24h0m0s'
 substitutions:
   _GCR_ZONE: 'gcr.io'
   _IMAGE_NAME: 'prjxray-db'
   _NUM_CPUS: '16'
+  _BUILD_TYPE: ''
 images:
   - '${_GCR_ZONE}/$PROJECT_ID/${_IMAGE_NAME}:${SHORT_SHA}'
diff --git a/Dockerfile b/.github/cloudbuild/Dockerfile
similarity index 88%
rename from Dockerfile
rename to .github/cloudbuild/Dockerfile
index d90cf860..e7408a7a 100644
--- a/Dockerfile
+++ b/.github/cloudbuild/Dockerfile
@@ -5,7 +5,7 @@ ARG NUM_PARALLEL_JOBS=1
 
 COPY . /source
 RUN cd /source && make -j${NUM_PARALLEL_JOBS} --output-sync=target --warn-undefined-variables build && make env
-RUN bash -c ". /source/database/artix7/settings.sh; cd /source/fuzzers && make --output-sync=target --warn-undefined-variables"
+RUN bash -c ". /source/database/artix7/settings.sh; cd /source/fuzzers && make --output-sync=target --warn-undefined-variables ${BUILD_TYPE}"
 #RUN find /source/database -mindepth 1 -maxdepth 1 -type d -exec /source/htmlgen/htmlgen.py --settings={}/settings.sh --output=/output/html \;
 RUN mkdir -p /output/raw && find /source/database -mindepth 1 -maxdepth 1 -type d -exec cp -R {} /output/raw \;