diff --git a/pipelines/fabric/src/main/resources/Makefile b/pipelines/fabric/src/main/resources/Makefile
index c3016f8..0528576 100644
--- a/pipelines/fabric/src/main/resources/Makefile
+++ b/pipelines/fabric/src/main/resources/Makefile
@@ -1,23 +1,10 @@
-BMV2_CPU_PORT=255
+all: fabric fabric-spgw
 
-BMV2_OPTIONS=-DTARGET_BMV2 -DCPU_PORT=$(BMV2_CPU_PORT)
+fabric:
+	@./bmv2-compile.sh "fabric" ""
 
-all: bmv2 bmv2-spgw
-
-bmv2: makedir
-	p4c-bm2-ss --arch v1model -o p4c-out/bmv2/fabric.json \
-		$(BMV2_OPTIONS) \
-		--p4runtime-file p4c-out/bmv2/fabric.p4info \
-		--p4runtime-format text fabric.p4
-
-bmv2-spgw: makedir
-	p4c-bm2-ss --arch v1model -o p4c-out/bmv2/fabric-spgw.json \
-		$(BMV2_OPTIONS) -DWITH_SPGW \
-		--p4runtime-file p4c-out/bmv2/fabric-spgw.p4info \
-		--p4runtime-format text fabric.p4
-
-makedir:
-	mkdir -p p4c-out/bmv2
+fabric-spgw:
+	@./bmv2-compile.sh "fabric-spgw" "-DWITH_SPGW"
 
 clean:
-	rm -rf p4c-out/bmv2/*
+	rm -rf p4c-out/*/bmv2