diff --git a/.gitignore b/.gitignore
index 09bf83e..b09ee95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 .vscode/
 target/
 logs/
+lib/
diff --git a/Makefile b/Makefile
index 15b5f49..ab53d92 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,26 @@
-.PHONY: clean build format lint run-dev run-dev-pitch run-rti test vendor-portico verify
+.PHONY: clean build format lint run-dev run-dev-pitch run-rti test verify clean-vendor
 
 APP_JAR := target/hla-xapi-1.0-SNAPSHOT-jar-with-dependencies.jar
+PORTICO_REPO_URL ?= https://github.com/yetanalytics/portico.git
+PORTICO_REF ?= yet_patch_object_subs
 PORTICO_JAR ?= lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.jar
 RTI_RID ?= RTI.rid
 SIM_CONFIG ?= config/Simulation.config
 PITCH_SIM_CONFIG ?= config/Simulation.pitch.config
 PITCH_RTI_LIB ?= $(HOME)/prti1516e/lib/*
 
-build:
+lib:
+	PORTICO_REPO_URL=$(PORTICO_REPO_URL) PORTICO_REF=$(PORTICO_REF) ./scripts/vendor-portico.sh
+
+build: lib
 	mvn package
 
 clean:
 	mvn clean
 
+clean-vendor:
+	rm -rf lib
+
 format:
 	mvn spotless:apply
 
@@ -22,9 +30,6 @@ lint:
 test:
 	mvn test
 
-vendor-portico:
-	./scripts/vendor-portico.sh
-
 verify:
 	mvn verify
 
diff --git a/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.jar b/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.jar
deleted file mode 100644
index c5a93f9..0000000
Binary files a/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.jar and /dev/null differ
diff --git a/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.jar.md5 b/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.jar.md5
deleted file mode 100644
index 4961eeb..0000000
--- a/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-a212b4742c281975590c47477220e769
diff --git a/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.jar.sha1 b/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.jar.sha1
deleted file mode 100644
index dbbced0..0000000
--- a/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f13e2ab781a76ce5e6fb9736859a5f6a71e1f8e9
diff --git a/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.jar.sha256 b/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.jar.sha256
deleted file mode 100644
index 1552e4b..0000000
--- a/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.jar.sha256
+++ /dev/null
@@ -1 +0,0 @@
-2ac10cabe265e098e71e0cc827f161d3c98e05296fc4efb05510590d4251fdae
diff --git a/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.pom b/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.pom
deleted file mode 100644
index 802ad09..0000000
--- a/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.porticoproject</groupId>
-    <artifactId>portico</artifactId>
-    <version>3.0.0-local</version>
-</project>
diff --git a/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.pom.md5 b/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.pom.md5
deleted file mode 100644
index ea3c305..0000000
--- a/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-72d66cdeb644ff984e2b42517273e0c1
diff --git a/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.pom.sha1 b/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.pom.sha1
deleted file mode 100644
index 6827eff..0000000
--- a/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5e8a2f113df54af823b7de906b3e9eb8e6c01a02
diff --git a/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.pom.sha256 b/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.pom.sha256
deleted file mode 100644
index 5079c68..0000000
--- a/lib/maven-repository/org/porticoproject/portico/3.0.0-local/portico-3.0.0-local.pom.sha256
+++ /dev/null
@@ -1 +0,0 @@
-fbeb2409962f7d371c555e35060ca1899e26e91053956e61c121a6b8220da2b8