Along the lines of the following for each

Build RUN go build -ldflags "${LDFLAGS:X github.com/skupperproject/skupper/pkg/version.Version=2.1.1-rh-1}" -o controller\ +RUN go build -ldflags "${LDFLAGS:-X github.com/skupperproject/skupper/internal/version.Version=2.1.1-rh-1}" -o controller\ cmd/controller/main.go

Target for 2.1.x patch release or 2.2