diff --git a/blockdag/process.go b/blockdag/process.go
index 8f7411beb..ac4090002 100644
--- a/blockdag/process.go
+++ b/blockdag/process.go
@@ -78,10 +78,7 @@ func (dag *BlockDAG) processOrphans(hash *daghash.Hash, flags BehaviorFlags) err
 		processHashes = processHashes[1:]
 
 		// Look up all orphans that are parented by the block we just
-		// accepted. This will typically only be one, but it could
-		// be multiple if multiple blocks are mined and broadcast
-		// around the same time. The one with the most proof of work
-		// will eventually win out. An indexing for loop is
+		// accepted.  An indexing for loop is
 		// intentionally used over a range here as range does not
 		// reevaluate the slice on each iteration nor does it adjust the
 		// index for the modified slice.
diff --git a/faucet/config/config.go b/faucet/config/config.go
index 444e94fcd..024b06461 100644
--- a/faucet/config/config.go
+++ b/faucet/config/config.go
@@ -28,8 +28,8 @@ var (
 type Config struct {
 	LogDir       string  `long:"logdir" description:"Directory to log output."`
 	HTTPListen   string  `long:"listen" description:"HTTP address to listen on (default: 0.0.0.0:8081)"`
-	APIServerURL string  `long:"api-server-url" description:"The API server url to connect to" required:"true"`
-	PrivateKey   string  `long:"private-key" description:"Faucet Private key" required:"true"`
+	KasparovdURL string  `long:"kasparovd-url" description:"The API server url to connect to"`
+	PrivateKey   string  `long:"private-key" description:"Faucet Private key"`
 	DBAddress    string  `long:"dbaddress" description:"Database address"`
 	DBUser       string  `long:"dbuser" description:"Database user" required:"true"`
 	DBPassword   string  `long:"dbpass" description:"Database password" required:"true"`
@@ -56,6 +56,15 @@ func Parse() error {
 		return err
 	}
 
+	if !cfg.Migrate {
+		if cfg.KasparovdURL == "" {
+			return errors.New("api-server-url argument is required when --migrate flag is not raised")
+		}
+		if cfg.PrivateKey == "" {
+			return errors.New("private-key argument is required when --migrate flag is not raised")
+		}
+	}
+
 	err = resolveNetwork(cfg)
 	if err != nil {
 		return err
diff --git a/faucet/docker/Dockerfile b/faucet/docker/Dockerfile
new file mode 100644
index 000000000..7929fe300
--- /dev/null
+++ b/faucet/docker/Dockerfile
@@ -0,0 +1,28 @@
+# -- multistage docker build: stage #1: build stage
+FROM golang:1.13-alpine AS build
+
+RUN mkdir -p /go/src/github.com/kaspanet/kaspad
+
+WORKDIR /go/src/github.com/kaspanet/kaspad
+
+RUN apk add --no-cache curl git
+
+COPY go.mod .
+COPY go.sum .
+
+RUN go mod download
+
+COPY . .
+
+RUN cd faucet && CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o faucet .
+
+# --- multistage docker build: stage #2: runtime image
+FROM alpine
+WORKDIR /app
+
+RUN apk add --no-cache tini
+
+COPY --from=build /go/src/github.com/kaspanet/kaspad/faucet /app/
+
+ENTRYPOINT ["/sbin/tini", "--"]
+CMD ["/app/faucet"]
diff --git a/faucet/faucet.go b/faucet/faucet.go
index 6296f88a8..384b24c24 100644
--- a/faucet/faucet.go
+++ b/faucet/faucet.go
@@ -40,7 +40,7 @@ func apiURL(requestPath string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	u, err := url.Parse(cfg.APIServerURL)
+	u, err := url.Parse(cfg.KasparovdURL)
 	if err != nil {
 		return "", errors.WithStack(err)
 	}
diff --git a/kasparov/kasparovd/config/config.go b/kasparov/kasparovd/config/config.go
index e8a02f2af..045ca0218 100644
--- a/kasparov/kasparovd/config/config.go
+++ b/kasparov/kasparovd/config/config.go
@@ -7,13 +7,13 @@ import (
 )
 
 const (
-	logFilename    = "apiserver.log"
-	errLogFilename = "apiserver_err.log"
+	logFilename    = "kasparovd.log"
+	errLogFilename = "kasparovd_err.log"
 )
 
 var (
 	// Default configuration options
-	defaultLogDir     = util.AppDataDir("apiserver", false)
+	defaultLogDir     = util.AppDataDir("kasparovd", false)
 	defaultHTTPListen = "0.0.0.0:8080"
 	activeConfig      *Config
 )
diff --git a/kasparov/kasparovd/docker/Dockerfile b/kasparov/kasparovd/docker/Dockerfile
index c8fd46fc2..0f4a09c67 100644
--- a/kasparov/kasparovd/docker/Dockerfile
+++ b/kasparov/kasparovd/docker/Dockerfile
@@ -14,7 +14,7 @@ RUN go mod download
 
 COPY . .
 
-RUN cd kasparov/kasparovd && CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o kasparov-server .
+RUN cd kasparov/kasparovd && CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o kasparovd .
 
 # --- multistage docker build: stage #2: runtime image
 FROM alpine
@@ -26,4 +26,4 @@ COPY --from=build /go/src/github.com/kaspanet/kaspad/kasparov/kasparovd/ /app/
 COPY --from=build /go/src/github.com/kaspanet/kaspad/kasparov/database/migrations/ /database/migrations/
 
 ENTRYPOINT ["/sbin/tini", "--"]
-CMD ["/app/kasparov-server"]
+CMD ["/app/kasparovd"]
diff --git a/kasparov/kasparovsyncd/config/config.go b/kasparov/kasparovsyncd/config/config.go
index 5fad8b233..a212068b7 100644
--- a/kasparov/kasparovsyncd/config/config.go
+++ b/kasparov/kasparovsyncd/config/config.go
@@ -8,13 +8,13 @@ import (
 )
 
 const (
-	logFilename    = "syncd.log"
-	errLogFilename = "syncd_err.log"
+	logFilename    = "kasparov_syncd.log"
+	errLogFilename = "kasparov_syncd_err.log"
 )
 
 var (
 	// Default configuration options
-	defaultLogDir = util.AppDataDir("syncd", false)
+	defaultLogDir = util.AppDataDir("kasparov_syncd", false)
 	activeConfig  *Config
 )